Merge "Small fix to MediaCodec"