Merge "Fix missing cross-ref links in the MediaPlayer.java javadoc"