Merge "Fix broken @see javadoc in android.media.* classes" into lmp-mr1-dev