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

if [ "x$ANDROID_JAVA_HOME" != x ] && [ -e "$ANDROID_JAVA_HOME/lib/tools.jar" ] ; then

    echo $ANDROID_JAVA_HOME/lib/tools.jar

else

    JAVAC=$(readlink -f $(which javac))

    JAVAC=$(which javac)

    if [ -z "$JAVAC" ] ; then

        exit 1

    fi

    while [ -L "$JAVAC" ] ; do

        LSLINE=$(ls -l "$JAVAC")

        JAVAC=$(echo -n "$LSLINE" | sed -e "s/.* -> //")

    done

    echo $JAVAC | sed -e "s:\(.*\)/bin/javac.*:\\1/lib/tools.jar:"

fi