Merge "MediaCodec refactoring part 2-b: introduce BufferChannel"