Merge "MediaPlayer2: remove MediaPlayerHWInterface"