Merge "Fix javadoc broken links in DocumentsContract." into nyc-mr1-dev