Merge "Revert "Fix Java detection on some Linux distributions""