diff --git a/build-prebuilts.sh b/build-prebuilts.sh
index 845dd51..022a06a 100755
--- a/build-prebuilts.sh
+++ b/build-prebuilts.sh
@@ -31,7 +31,6 @@
 esac
 
 build_soong=1
-build_asan=1
 [[ ! -d ${TOP}/toolchain/go ]] || build_go=1
 
 use_musl=false
@@ -44,7 +43,6 @@
                 musl) use_musl=true ;;
                 skip-go) unset build_go ;;
                 skip-soong-tests) skip_soong_tests=--skip-soong-tests ;;
-		skip-asan) unset build_asan ;;
                 *) echo "Unknown option --${OPTARG}"; exit 1 ;;
             esac;;
         *) echo "'${opt}' '${OPTARG}'"
@@ -81,7 +79,7 @@
     [[ -z "${clean}" ]] || rm -rf ${SOONG_OUT}
     mkdir -p ${SOONG_OUT}
     rm -rf ${SOONG_OUT}/dist ${SOONG_OUT}/dist-common
-    cat > ${SOONG_OUT}/soong.variables.tmp << EOF
+    cat > ${SOONG_OUT}/soong.variables << EOF
 {
     "Allow_missing_dependencies": true,
     "HostArch":"x86_64",
@@ -98,45 +96,38 @@
     }
 }
 EOF
-    if cmp -s ${SOONG_OUT}/soong.variables.tmp ${SOONG_OUT}/soong.variables; then
-	rm ${SOONG_OUT}/soong.variables.tmp
-    else
-	mv -f ${SOONG_OUT}/soong.variables.tmp ${SOONG_OUT}/soong.variables
-    fi
-    SOONG_GO_BINARIES=(
-        bpfmt
-        bssl_inject_hash
-        go_extractor
-        merge_zips
-        soong_zip
-        runextractor
-        rust_extractor
-        symbol_inject
-        zip2zip
-    )
     SOONG_BINARIES=(
         acp
         aidl
         bison
         bloaty
+        bpfmt
         brotli
+        bssl_inject_hash
         bzip2
         ckati
         ckati_stamp_dump
         flex
         gavinhoward-bc
+        go_extractor
         hidl-gen
         hidl-lint
         m4
         make
+        merge_zips
         ninja
         one-true-awk
         openssl
         py3-cmd
         py3-launcher64
         py3-launcher-autorun64
+        runextractor
+        rust_extractor
+        soong_zip
+        symbol_inject
         toybox
         xz
+        zip2zip
         zipalign
         ziptime
         ziptool
@@ -174,7 +165,6 @@
         )
     fi
 
-    go_binaries="${SOONG_GO_BINARIES[@]/#/${SOONG_HOST_OUT}/bin/}"
     binaries="${SOONG_BINARIES[@]/#/${SOONG_HOST_OUT}/bin/}"
     asan_binaries="${SOONG_ASAN_BINARIES[@]/#/${SOONG_HOST_OUT}/bin/}"
     jars="${SOONG_JAVA_LIBRARIES[@]/#/${SOONG_HOST_OUT}/framework/}"
@@ -192,17 +182,12 @@
         musl_x86_sysroot="${SOONG_OUT}/.intermediates/external/musl/libc_musl_sysroot/linux_musl_x86/gen/libc_musl_sysroot.zip"
         musl_x86_64_sysroot="${SOONG_OUT}/.intermediates/external/musl/libc_musl_sysroot/linux_musl_x86_64/gen/libc_musl_sysroot.zip"
 
-        SOONG_HOST_ARM_OUT=${OUT_DIR}/soong/host/linux-arm64
-        binaries="${binaries} ${SOONG_BINARIES[@]/#/${SOONG_HOST_ARM_OUT}/bin/}"
-        binaries="${binaries} ${SOONG_MUSL_BINARIES[@]/#/${SOONG_HOST_ARM_OUT}/bin/}"
-
         musl_arm_sysroot="${SOONG_OUT}/.intermediates/external/musl/libc_musl_sysroot/linux_musl_arm/gen/libc_musl_sysroot.zip"
         musl_arm64_sysroot="${SOONG_OUT}/.intermediates/external/musl/libc_musl_sysroot/linux_musl_arm64/gen/libc_musl_sysroot.zip"
     fi
 
     # Build everything
     build/soong/soong_ui.bash --make-mode --soong-only --skip-config ${skip_soong_tests} \
-        ${go_binaries} \
         ${binaries} \
         ${wrappers} \
         ${jars} \
@@ -246,8 +231,7 @@
         cp ${musl_arm64_sysroot} ${SOONG_OUT}/musl-sysroot-aarch64-unknown-linux-musl.zip
     fi
 
-
-    if [[ $OS == "linux" && -n "${build_go}" ]]; then
+    if [[ $OS == "linux" ]]; then
         # Build ASAN versions
         export ASAN_OPTIONS=detect_leaks=0
         cat > ${SOONG_OUT}/soong.variables << EOF