Merge "MediaPlayer2: clean up code"