am 4a36a971: am f2aef5d8: Merge "Revert "media: AdaptivePlaybackTest: properly handle missing codecs"" into klp-modular-dev * commit '4a36a971': Revert "media: AdaptivePlaybackTest: properly handle missing codecs"