Merge "Fixed javadoc so @hide annotations don't show up in the API."