Allow building with OpenJDK" into kk4.4