diff --git a/Makefile b/Makefile
index ad01e869d..d9e2e1c01 100644
--- a/Makefile
+++ b/Makefile
@@ -11,9 +11,9 @@ REVISION=$(shell git rev-parse --short HEAD)
 
 # set PATH to find CC in managed toolchains
 ifeq ($(TARGET), android)
-	PATH:=$(CURDIR)/$(KOR_BASE)/$(ANDROID_TOOLCHAIN)/bin:$(PATH)
+	PATH:=$(ANDROID_TOOLCHAIN)/bin:$(PATH)
 else ifeq ($(TARGET), pocketbook)
-	PATH:=$(CURDIR)/$(KOR_BASE)/$(POCKETBOOK_TOOLCHAIN)/bin:$(PATH)
+	PATH:=$(POCKETBOOK_TOOLCHAIN)/bin:$(PATH)
 endif
 
 MACHINE=$(shell PATH=$(PATH) $(CC) -dumpmachine 2>/dev/null)
diff --git a/base b/base
index 132b16625..55032c87b 160000
--- a/base
+++ b/base
@@ -1 +1 @@
-Subproject commit 132b166259d300de884ef24c6e410e779b3ebd00
+Subproject commit 55032c87b2a7135819a20257b3b78c63a525a26b
diff --git a/platform/android/luajit-launcher b/platform/android/luajit-launcher
index 04f6f08c2..f304bf865 160000
--- a/platform/android/luajit-launcher
+++ b/platform/android/luajit-launcher
@@ -1 +1 @@
-Subproject commit 04f6f08c296bff0c435b060cbf32b38e44983e79
+Subproject commit f304bf86590c426ba9a6dd835c0eaebccdd49d50