Merge "MediaCodec refactoring part 1-c: buffer ownership"