Merge "MediaExtractorTest: remove MediaCodec blocking call to avoid deadlock" into stage-aosp-sc-ts-dev