Merge "reverting to jdk8 build server"
-rw-r--r-- 689 .gitignore
-rw-r--r-- 87 .gitreview
drwxr-xr-x - jjb