I compared the hermetic-java-runtime branch with mainline, and noticed some old build changes lingering, that are no longer needed. Furthermore, I checked a handful of other files and noticed a few spurious changes that just make the branch differ from mainline for no good reason. I also reverted those.

With this patch, the difference between hermetic-java-runtime and mainline gets even more minimal.