Merge "Add acloud shortcut in envsetup.sh"

    esac

}

function acloud()

{

    # Let's use the built version over the prebuilt.

    local built_acloud=${ANDROID_HOST_OUT}/bin/acloud

    if [ -f $built_acloud ]; then

        $built_acloud "$@"

        return $?

    fi

    local host_os_arch=$(get_build_var HOST_PREBUILT_TAG)

    case $host_os_arch in

        linux-x86) "$(gettop)"/prebuilts/asuite/acloud/linux-x86/acloud "$@"

        ;;

    *)

        echo "acloud is not supported on your host arch: $host_os_arch"

        ;;

    esac

}

# Execute the contents of any vendorsetup.sh files we can find.

function source_vendorsetup() {

    for dir in device vendor product; do