diff --git a/Makefile b/Makefile
index 8724fe140..e3092b174 100644
--- a/Makefile
+++ b/Makefile
@@ -31,12 +31,7 @@ endif
 ANDROID_VERSION?=$(shell git rev-list --count HEAD)
 ANDROID_NAME?=$(VERSION)
 
-# set PATH to find CC in managed toolchains
-ifeq ($(TARGET), android)
-	PATH:=$(ANDROID_TOOLCHAIN)/bin:$(PATH)
-endif
-
-MACHINE=$(shell PATH='$(PATH)' $(CC) -dumpmachine 2>/dev/null)
+MACHINE=$(shell $(CC) -dumpmachine 2>/dev/null)
 ifdef KODEBUG
 	MACHINE:=$(MACHINE)-debug
 	KODEDUG_SUFFIX:=-debug
@@ -417,7 +412,11 @@ androidupdate: all
 		;
 
 	# make the android APK
-	$(MAKE) -C $(ANDROID_LAUNCHER_DIR) $(if $(KODEBUG), debug, release) \
+	# Note: filter out the `--debug=…` make flag
+	# so the old crummy version provided by the
+	# NDK does not blow a gasket.
+	MAKEFLAGS='$(filter-out --debug=%,$(MAKEFLAGS))' \
+		$(MAKE) -C $(ANDROID_LAUNCHER_DIR) $(if $(KODEBUG), debug, release) \
 		ANDROID_APPNAME=KOReader \
 		ANDROID_VERSION=$(ANDROID_VERSION) \
 		ANDROID_NAME=$(ANDROID_NAME) \
@@ -593,8 +592,11 @@ endif
 androiddev: androidupdate
 	$(MAKE) -C $(ANDROID_LAUNCHER_DIR) dev
 
-android-toolchain:
-	$(MAKE) -C $(KOR_BASE) android-toolchain
+android-ndk:
+	$(MAKE) -C $(KOR_BASE)/toolchain $(ANDROID_NDK_HOME)
+
+android-sdk:
+	$(MAKE) -C $(KOR_BASE)/toolchain $(ANDROID_HOME)
 
 
 # for gettext
diff --git a/base b/base
index 9b5cf240b..c1a5edb2b 160000
--- a/base
+++ b/base
@@ -1 +1 @@
-Subproject commit 9b5cf240bf8f60e4fa8328243f06ddaacb69342b
+Subproject commit c1a5edb2b5d61c30d656b8915c3710dd3588bc5f
diff --git a/kodev b/kodev
index b2deddf2c..fe91314bc 100755
--- a/kodev
+++ b/kodev
@@ -20,15 +20,6 @@ fi
 # Default Android build to arm.
 ANDROID_ARCH="${ANDROID_ARCH:-arm}"
 
-# Default to Android 4.0+; required for NDK 15 but with a custom NDK the strict minimum is 9.
-if [[ "${ANDROID_ARCH}" == "arm64" ]] || [[ "${ANDROID_ARCH}" == "x86_64" ]]; then
-    # 64bit arches require at least ABI 21
-    NDKABI="${NDKABI:-21}"
-else
-    NDKABI="${NDKABI:-14}"
-fi
-export NDKABI
-
 # Default android flavor
 ANDROID_FLAVOR="${ANDROID_FLAVOR:-rocks}"
 export ANDROID_FLAVOR
@@ -264,21 +255,7 @@ ${SUPPORTED_TARGETS}"
             assert_ret_zero $?
             ;;
         android)
-            if [ -z "${NDK}" ]; then
-                if [ -n "${ANDROID_NDK_HOME}" ]; then
-                    # some distributions use `ANDROID_NDK` instead, fall back to it
-                    export NDK="${ANDROID_NDK_HOME}"
-                else
-                    export NDK="${CURDIR}/base/toolchain/android-ndk-r15c"
-                fi
-            fi
-            [ -e "${CURDIR}/base/toolchain/android-toolchain-${ANDROID_ARCH}/bin/" ] || {
-                { [ -e "${NDK}" ] || make -C "${CURDIR}/base/toolchain" android-ndk; }
-                assert_ret_zero $?
-                make android-toolchain
-                assert_ret_zero $?
-            }
-            echo "Using NDK: ${NDK}..."
+            make android-ndk || exit $?
             make TARGET=android
             assert_ret_zero $?
             ;;
@@ -550,14 +527,8 @@ ${SUPPORTED_RELEASE_TARGETS}"
             make TARGET=kindle-legacy update
             ;;
         android)
+            make android-sdk || exit $?
             kodev-build android
-            export PATH=${PATH}:${CURDIR}/base/toolchain/android-sdk-linux/tools
-            command -v android &>/dev/null || {
-                make -C "${CURDIR}/base/toolchain" android-sdk
-            }
-            ANDROID_HOME=$(dirname "$(dirname "$(command -v android)")")
-            export ANDROID_HOME
-            export PATH="${PATH}:${NDK}"
             make TARGET=android update
             ;;
         pocketbook)
diff --git a/platform/android/luajit-launcher b/platform/android/luajit-launcher
index eb0fb50c6..a21ed9378 160000
--- a/platform/android/luajit-launcher
+++ b/platform/android/luajit-launcher
@@ -1 +1 @@
-Subproject commit eb0fb50c65dd0765baf82502c2892e7b24f3d963
+Subproject commit a21ed93786c272fad4040d94fc2518532ed2bfeb