Merge "MediaPlayer2: update javadoc"