am 9d29fc2d: am 7beaea15: am 15d00664: Merge "Revert "Fix Java detection on some Linux distributions""

* commit '9d29fc2d3cd080e2ca6dc560df447d4fcfa7222b':
  Revert "Fix Java detection on some Linux distributions"