Merge "Remove Java class name restriction on uses-library" into main