Merge "Fix openJdk package-level javadocs"