Merge "Use sensible default locations for Java" am: 8f354bc8c2
am: 2fc3bef75a

* commit '2fc3bef75aae22178778bdaa407a0befa5345456':
  Use sensible default locations for Java