Merge "Revert "Revert "[make] Add memtag-stack sanitizer, switch to linker-generated notes."""
diff --git a/envsetup.sh b/envsetup.sh
index 852352d..0eeb7f4 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -398,6 +398,7 @@
       packages/modules/adb/adb.bash
       system/core/fastboot/fastboot.bash
       tools/asuite/asuite.sh
+      prebuilts/bazel/common/bazel-complete.bash
     )
     # Completion can be disabled selectively to allow users to use non-standard completion.
     # e.g.
@@ -419,6 +420,8 @@
     if [ -z "$ZSH_VERSION" ]; then
         # Doesn't work in zsh.
         complete -o nospace -F _croot croot
+        # TODO(b/244559459): Support b autocompletion for zsh
+        complete -F _bazel__complete -o nospace b
     fi
     complete -F _lunch lunch
 
@@ -1873,7 +1876,7 @@
         if [[ $config_set -ne 1 ]]; then
             bazel_args_with_config+="--config=bp2build "
         fi
-        eval "bazel $bazel_args_with_config"
+        bazel $bazel_args_with_config
     fi
 )