Merge "media: MediaCodec buffer API revision"