Merge "MediaCodec: address API review #2" into rvc-dev