Merge "Improve bazel() warning in envsetup.sh."

function bazel()

{

    if which bazel &>/dev/null; then

        >&2 echo "NOTE: bazel() function sourced from Android's envsetup.sh is being used instead of $(which bazel)"

        >&2 echo

    fi

    local T="$(gettop)"

    if [ ! "$T" ]; then

        echo "Couldn't locate the top of the tree.  Try setting TOP."

        >&2 echo "Couldn't locate the top of the Android tree. Try setting TOP. This bazel() function cannot be used outside of the AOSP directory."

        return

    fi

    if which bazel &>/dev/null; then

        >&2 echo "NOTE: bazel() function sourced from envsetup.sh is being used instead of $(which bazel)"

        >&2 echo

    fi

    "$T/tools/bazel" "$@"

}