Merge "Revert "Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8"" into nyc-dev