Merge "MediaCodec: minor revision of APIs for vendor parameters"