Merge "MediaPlayer2: unhide MediaPlayer2 and related classes."