Merge "Revert "Make OpenJDK 8 the default""
am: c0acea2571

* commit 'c0acea25717fb26a13572d459b02811d8c8f9db6':
  Revert "Make OpenJDK 8 the default"