diff --git a/scripts/android/build_iconv.sh b/scripts/android/build_iconv.sh
index 19c3f9336..4c40845fc 100755
--- a/scripts/android/build_iconv.sh
+++ b/scripts/android/build_iconv.sh
@@ -17,9 +17,9 @@ PATH="${TOOLCHAIN_BASE_DIR}_${arch}/bin:${ORIGINAL_PATH}"
 
 case $arch in
 	"aarch"	)
-		CLANG=armv7a-linux-androideabi-clang
-		CXXLANG=arm-linux-androideabi-clang++
-		HOST="arm-linux-android";;
+		CLANG=arm-linux-androideabi-clang
+        CXXLANG=arm-linux-androideabi-clang++
+        HOST="arm-linux-android";;
 	*		)
 		CLANG=${arch}-linux-android-clang
 		CXXLANG=${arch}-linux-android-clang++
diff --git a/scripts/android/install_ndk.sh b/scripts/android/install_ndk.sh
old mode 100755
new mode 100644
index 34bbcd61e..6455dfc8c
--- a/scripts/android/install_ndk.sh
+++ b/scripts/android/install_ndk.sh
@@ -1,8 +1,18 @@
 #!/bin/sh
 
 . ./config.sh
+TOOLCHAIN_DIR=${WORKDIR}/toolchain
+TOOLCHAIN_A32_DIR=${TOOLCHAIN_DIR}_aarch
+TOOLCHAIN_A64_DIR=${TOOLCHAIN_DIR}_aarch64
+TOOLCHAIN_x86_DIR=${TOOLCHAIN_DIR}_i686
+TOOLCHAIN_x86_64_DIR=${TOOLCHAIN_DIR}_x86_64
 ANDROID_NDK_SHA256="3f541adbd0330a9205ba12697f6d04ec90752c53d6b622101a2a8a856e816589"
 
 curl https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip -o ${ANDROID_NDK_ZIP}
 echo $ANDROID_NDK_SHA256 $ANDROID_NDK_ZIP | sha256sum -c || exit 1
 unzip /opt/android/android-ndk-r17c.zip -d $WORKDIR
+
+${ANDROID_NDK_ROOT}/build/tools/make_standalone_toolchain.py --arch arm64 --api $API --install-dir ${TOOLCHAIN_A64_DIR} --stl=libc++
+${ANDROID_NDK_ROOT}/build/tools/make_standalone_toolchain.py --arch arm --api $API --install-dir ${TOOLCHAIN_A32_DIR} --stl=libc++
+${ANDROID_NDK_ROOT}/build/tools/make_standalone_toolchain.py --arch x86 --api $API --install-dir ${TOOLCHAIN_x86_DIR} --stl=libc++
+${ANDROID_NDK_ROOT}/build/tools/make_standalone_toolchain.py --arch x86_64 --api $API --install-dir ${TOOLCHAIN_x86_64_DIR} --stl=libc++