Merge "Error out early on nonstandard JDK directory layouts"