Merge "MediaCodec refactoring part 2-a: introduce callback"