Merge "MediaCodec refactoring part 1-a: buffers become separate class"