Merge "Make OpenJDK 8 the default"