Allow building with javac 1.7

Change-Id: Id8d78558736482e10c52f2cc86a2b903b1fbdbe5
Merge "Allow building with javac 1.7" into kk4.4