Merge "Fix broken Javadoc links in frameworks/base"