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

* commit '3017e13fc8556420a2c0fb8f4a38a866b6689e0a':
  Fix Java detection on some Linux distributions