Merge "MediaPlayer2: clean up more code"