Merge "Revert "Revert "Make OpenJDK 8 the default"""