am 1778c874: am 3017e13f: am c7f1389d: Merge "Fix Java detection on some Linux distributions"
am 1778c874: am 3017e13f: am c7f1389d: Merge "Fix Java detection on some Linux distributions"

* commit '1778c8746551c8f132a020f9ea4d56d13c7712d5':
  Fix Java detection on some Linux distributions

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