Merge "fix javadoc for grantRuntimePermission"