Merge "Fix targetSDK javadoc."