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

This reverts commit ee89f219ea8298c3b4718ae0dd05061ce372b384.

This reapplies commit
1bd16b67c4b05f9df1f6d9ef85365929df0c34ef
for the third time.

Change-Id: I3be72f643f5ddce87dfc39d98f19e395525554d8
3 files changed