Merge

8176046: Replace package.html files with package-info.java in the java.desktop module
Reviewed-by: alexsch