am b3f42ed0: am 4e3e9ffb: Merge "Fix Java detection on some Linux distributions"
am b3f42ed0: am 4e3e9ffb: Merge "Fix Java detection on some Linux distributions"

* commit 'b3f42ed09a141b23c0738a828788b3d77d610b4b':
  Fix Java detection on some Linux distributions

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build