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

* commit 'ee4e247d24496da615d0270146c0a058074badc5':
  Use sensible default locations for Java