Merge "No longer pin the Java version used to build Vogar to 1.7."