Merge "MediaPlayer2: clean up APIs"