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

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