Merge "MediaCodec async callbacks"