Merge "MediaPlayer: fix channel mask handling"