Merge "MediaCodec: address API review"