Merge "MediaPlayer2: remove MediaPlayer2Engine"