"Allow building with javac 1.7" into kk4.4