Merge "Fix a couple bad links in the javadoc for android.os.health." into nyc-dev