Merge "MediaPlayer2: fix a typo"