diff --git a/master/master.cfg b/master/master.cfg
index 15cfd85..d418853 100644
--- a/master/master.cfg
+++ b/master/master.cfg
@@ -817,7 +817,7 @@ class ConfigCommand(object):
 
         # Set up the path to the android NDK
         if testing_android:
-            s += " --android-cross-path=/android/ndk-arm-18"
+            s += " --android-cross-path=/android/ndk-arm-16"
             s += " --disable-docs"
 
         if "release-channel" in props:
diff --git a/slaves/android/install-ndk.sh b/slaves/android/install-ndk.sh
index c6544b7..ff70712 100644
--- a/slaves/android/install-ndk.sh
+++ b/slaves/android/install-ndk.sh
@@ -8,6 +8,13 @@ set -ex
 curl -O http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin
 chmod +x android-ndk-r10e-linux-x86_64.bin
 ./android-ndk-r10e-linux-x86_64.bin > /dev/null
+
+bash android-ndk-r10e/build/tools/make-standalone-toolchain.sh \
+        --platform=android-16 \
+        --toolchain=arm-linux-androideabi-4.8 \
+        --install-dir=/android/ndk-arm-16 \
+        --ndk-dir=/android/android-ndk-r10e \
+        --arch=arm
 bash android-ndk-r10e/build/tools/make-standalone-toolchain.sh \
         --platform=android-18 \
         --toolchain=arm-linux-androideabi-4.8 \