diff --git a/ci/android-install-ndk.sh b/ci/android-install-ndk.sh
index 463565125972f..4ef498c1d6ca4 100644
--- a/ci/android-install-ndk.sh
+++ b/ci/android-install-ndk.sh
@@ -6,36 +6,7 @@ NDK=android-ndk-r21d
 wget --tries=20 -q https://dl.google.com/android/repository/${NDK}-linux-x86_64.zip
 unzip -q ${NDK}-linux-x86_64.zip
 
-case "$1" in
-  arm)
-    arch=arm
-    api=28
-    ;;
-  armv7)
-    arch=arm
-    api=28
-    ;;
-  aarch64)
-    arch=arm64
-    api=28
-    ;;
-  i686)
-    arch=x86
-    api=28
-    ;;
-  x86_64)
-    arch=x86_64
-    api=28
-    ;;
-  *)
-    echo "invalid arch: $1"
-    exit 1
-    ;;
-esac;
-
-python3 ${NDK}/build/tools/make_standalone_toolchain.py \
-        --install-dir "/android/ndk-${1}" \
-        --arch "${arch}" \
-        --api ${api}
+mkdir -p /android/ndk-${1}/bin
+mv ${NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/* /android/ndk-${1}/bin
 
 rm -rf ./${NDK}-linux-x86_64.zip ./${NDK}
diff --git a/ci/docker/arm-linux-androideabi/Dockerfile b/ci/docker/arm-linux-androideabi/Dockerfile
index 93d850b38eb1f..41e456bfc465c 100644
--- a/ci/docker/arm-linux-androideabi/Dockerfile
+++ b/ci/docker/arm-linux-androideabi/Dockerfile
@@ -28,9 +28,9 @@ RUN chmod 777 -R /tmp/.android
 RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linux-x86_64/*
 
 ENV PATH=$PATH:/rust/bin \
-    CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi-gcc \
+    CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi28-clang \
     CARGO_TARGET_ARM_LINUX_ANDROIDEABI_RUNNER=/tmp/runtest \
-    CC_arm_linux_androideabi=arm-linux-androideabi-gcc \
+    CC_arm_linux_androideabi=armv7a-linux-androideabi28-clang \
     HOME=/tmp
 
 ADD runtest-android.rs /tmp/runtest.rs
diff --git a/ci/docker/i686-linux-android/Dockerfile b/ci/docker/i686-linux-android/Dockerfile
index ed1b2e9fbef0e..f3cb9a8dda142 100644
--- a/ci/docker/i686-linux-android/Dockerfile
+++ b/ci/docker/i686-linux-android/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:22.04
 
 RUN dpkg --add-architecture i386
 RUN apt-get update
-RUN apt-get install -y --no-install-recommends libc6-dev gcc
+RUN apt-get install -y --no-install-recommends linux-libc-dev:i386 gcc
 RUN apt-get install -y --no-install-recommends \
   file \
   wget \
@@ -12,7 +12,8 @@ RUN apt-get install -y --no-install-recommends \
   unzip \
   expect \
   openjdk-8-jre \
-  libstdc++6:i386 \
+  libstdc++-10-dev:i386 \
+  libc++-dev:i386 \
   libpulse0
 
 WORKDIR /android/
@@ -28,9 +29,9 @@ RUN chmod 777 -R /tmp/.android
 RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linux-x86_64/*
 
 ENV PATH=$PATH:/rust/bin \
-    CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android-gcc \
+    CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android28-clang \
     CARGO_TARGET_I686_LINUX_ANDROID_RUNNER=/tmp/runtest \
-    CC_i686_linux_android=i686-linux-android-gcc \
+    CC_i686_linux_android=i686-linux-android28-clang \
     HOME=/tmp
 
 ADD runtest-android.rs /tmp/runtest.rs
diff --git a/libc-test/src/cmsg.c b/libc-test/src/cmsg.c
index a8b1c371736c8..feb452e483850 100644
--- a/libc-test/src/cmsg.c
+++ b/libc-test/src/cmsg.c
@@ -2,9 +2,9 @@
 #include <sys/socket.h>
 
 // Since the cmsg(3) macros are macros instead of functions, they aren't
-// available to FFI.  libc must reimplement them, which is error-prone.  This
+// available to FFI. libc must reimplement them, which is error-prone. This
 // file provides FFI access to the actual macros so they can be tested against
-// the Rust reimplementations.
+// the Rust re-implementation.
 
 struct cmsghdr *cmsg_firsthdr(struct msghdr *msgh) {
 	return CMSG_FIRSTHDR(msgh);