Merge "MediaCodec: avoid touching output format at MediaCodec"