Merge "MediaPlayer2: remove MediaPlayer2Impl"