Merge "Error out early on nonstandard JDK directory layouts" am: 506113d267 am: e95cf75293
am: 1ac51c013e

* commit '1ac51c013e134c7a22580f9020e3b89851153a7e':
  Error out early on nonstandard JDK directory layouts