Merge "MediaPlayer2: remove inheritance on MediaPlayerBase"