diff --git a/ci/android-install-sdk.sh b/ci/android-install-sdk.sh
index 5e7037df044ef..6f0968f8c99d8 100644
--- a/ci/android-install-sdk.sh
+++ b/ci/android-install-sdk.sh
@@ -9,10 +9,10 @@ set -ex
 # located in https://github.com/appunite/docker by just wrapping it in a script
 # which apparently magically accepts the licenses.
 
-SDK=6609375
-mkdir -p sdk/cmdline-tools
+SDK=8512546
+mkdir sdk
 wget -q --tries=20 https://dl.google.com/android/repository/commandlinetools-linux-${SDK}_latest.zip
-unzip -q -d sdk/cmdline-tools commandlinetools-linux-${SDK}_latest.zip
+unzip -q -d sdk commandlinetools-linux-${SDK}_latest.zip
 
 case "$1" in
   arm | armv7)
@@ -44,15 +44,15 @@ echo '### User Sources for Android SDK Manager' >> /root/.android/repositories.c
 echo '#Fri Nov 03 10:11:27 CET 2017 count=0' >> /root/.android/repositories.cfg
 
 # Print all available packages
-# yes | ./sdk/tools/bin/sdkmanager --list --verbose
+# yes | ./sdk/cmdline-tools/bin/sdkmanager --list --verbose
 
 # --no_https avoids
 # javax.net.ssl.SSLHandshakeException: sun.security.validator.ValidatorException: No trusted certificate found
 #
 # | grep -v = || true    removes the progress bar output from the sdkmanager
 # which produces an insane amount of output.
-yes | ./sdk/cmdline-tools/tools/bin/sdkmanager --licenses --no_https | grep -v = || true
-yes | ./sdk/cmdline-tools/tools/bin/sdkmanager --no_https \
+yes | ./sdk/cmdline-tools/bin/sdkmanager --licenses --no_https | grep -v = || true
+yes | ./sdk/cmdline-tools/bin/sdkmanager --no_https \
         "platform-tools" \
         "platforms;android-${api}" \
         "${image}" | grep -v = || true
@@ -65,7 +65,7 @@ unzip -q -d sdk emulator-linux_x64-9058569.zip
 cp /android/android-emulator-package.xml /android/sdk/emulator/package.xml
 
 echo "no" |
-    ./sdk/cmdline-tools/tools/bin/avdmanager create avd \
+    ./sdk/cmdline-tools/bin/avdmanager create avd \
         --name "${1}" \
         --package "${image}" | grep -v = || true
 
diff --git a/ci/docker/aarch64-linux-android/Dockerfile b/ci/docker/aarch64-linux-android/Dockerfile
index b009e95b0e71e..d05dca2cd79e8 100644
--- a/ci/docker/aarch64-linux-android/Dockerfile
+++ b/ci/docker/aarch64-linux-android/Dockerfile
@@ -25,7 +25,7 @@ RUN sh /android/android-install-ndk.sh $ANDROID_ARCH
 RUN sh /android/android-install-sdk.sh $ANDROID_ARCH
 RUN mv /root/.android /tmp
 RUN chmod 777 -R /tmp/.android
-RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linux-x86_64/*
+RUN chmod 755 /android/sdk/cmdline-tools/* /android/sdk/emulator/qemu/linux-x86_64/*
 
 ENV PATH=$PATH:/rust/bin \
     CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android28-clang \
diff --git a/ci/docker/arm-linux-androideabi/Dockerfile b/ci/docker/arm-linux-androideabi/Dockerfile
index 93d850b38eb1f..c85049d052ac9 100644
--- a/ci/docker/arm-linux-androideabi/Dockerfile
+++ b/ci/docker/arm-linux-androideabi/Dockerfile
@@ -25,7 +25,7 @@ RUN sh /android/android-install-ndk.sh $ANDROID_ARCH
 RUN sh /android/android-install-sdk.sh $ANDROID_ARCH
 RUN mv /root/.android /tmp
 RUN chmod 777 -R /tmp/.android
-RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linux-x86_64/*
+RUN chmod 755 /android/sdk/cmdline-tools/* /android/sdk/emulator/qemu/linux-x86_64/*
 
 ENV PATH=$PATH:/rust/bin \
     CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi-gcc \
diff --git a/ci/docker/i686-linux-android/Dockerfile b/ci/docker/i686-linux-android/Dockerfile
index ed1b2e9fbef0e..43ea86b4a646d 100644
--- a/ci/docker/i686-linux-android/Dockerfile
+++ b/ci/docker/i686-linux-android/Dockerfile
@@ -25,7 +25,7 @@ RUN sh /android/android-install-ndk.sh $ANDROID_ARCH
 RUN sh /android/android-install-sdk.sh $ANDROID_ARCH
 RUN mv /root/.android /tmp
 RUN chmod 777 -R /tmp/.android
-RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linux-x86_64/*
+RUN chmod 755 /android/sdk/cmdline-tools/* /android/sdk/emulator/qemu/linux-x86_64/*
 
 ENV PATH=$PATH:/rust/bin \
     CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android-gcc \