Merge "Fix broken @see javadoc in android.media.* classes"