diff --git a/.gitlab-ci/android-cts-runner.sh b/.gitlab-ci/android-cts-runner.sh
index b891dea95b1..2ae31b63aa0 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-tools/build-tools:/android-cts/jdk/bin/:$PATH
+export PATH=/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 909eb75a19b..c45e3542085 100755
--- a/.gitlab-ci/container/debian/x86_64_test-android.sh
+++ b/.gitlab-ci/container/debian/x86_64_test-android.sh
@@ -30,6 +30,7 @@ EPHEMERAL=(
 )
 
 DEPS=(
+    aapt
     iproute2
 )
 apt-get install -y --no-remove --no-install-recommends \
@@ -56,12 +57,6 @@ 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