diff --git a/.gitlab-ci/android-cts-runner.sh b/.gitlab-ci/android-cts-runner.sh
index 51a62adc181..cad7f5b636c 100755
--- a/.gitlab-ci/android-cts-runner.sh
+++ b/.gitlab-ci/android-cts-runner.sh
@@ -6,7 +6,7 @@
 
 ci_tag_test_time_check "ANDROID_CTS_TAG"
 
-export PATH=/android-cts/jdk/bin/:$PATH
+export PATH=/android-tools/build-tools:/android-cts/jdk/bin/:$PATH
 export JAVA_HOME=/android-cts/jdk
 
 # Wait for the appops service to show up
diff --git a/.gitlab-ci/container/debian/x86_64_test-android.sh b/.gitlab-ci/container/debian/x86_64_test-android.sh
index c45e3542085..909eb75a19b 100755
--- a/.gitlab-ci/container/debian/x86_64_test-android.sh
+++ b/.gitlab-ci/container/debian/x86_64_test-android.sh
@@ -30,7 +30,6 @@ EPHEMERAL=(
 )
 
 DEPS=(
-    aapt
     iproute2
 )
 apt-get install -y --no-remove --no-install-recommends \
@@ -57,6 +56,12 @@ curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
   -o vulkaninfo "https://${S3_HOST}/${S3_ANDROID_BUCKET}/mesa/mesa/${DATA_STORAGE_PATH}/vulkaninfo-android-x86_64"
 chmod +x vulkaninfo
 
+curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+  -o "build-tools_r${ANDROID_SDK_VERSION}-linux.zip" "https://dl.google.com/android/repository/build-tools_r${ANDROID_SDK_VERSION}-linux.zip"
+unzip "build-tools_r${ANDROID_SDK_VERSION}-linux.zip"
+rm "build-tools_r${ANDROID_SDK_VERSION}-linux.zip"
+mv "android-$ANDROID_VERSION" build-tools
+
 popd
 
 section_end android-tools
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 024780812e9..f4dce219aa6 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -23,7 +23,7 @@ variables:
 
   DEBIAN_BUILD_TAG: "20250611-rust"
 
-  DEBIAN_TEST_ANDROID_TAG: "20250620-sttag"
+  DEBIAN_TEST_ANDROID_TAG: "20250624-build-tools"
   DEBIAN_TEST_GL_TAG: "20250616-vkcts-main"
   DEBIAN_TEST_VIDEO_TAG: "20250609-helper"
   DEBIAN_TEST_VK_TAG: "20250619-vkd3d"