Merge "MediaPlayer2: remove unused methods"