diff --git a/prepare.py b/prepare.py
index 59200b4c4..1e2316165 100755
--- a/prepare.py
+++ b/prepare.py
@@ -84,7 +84,7 @@ class AndroidPreparator(prepare.Preparator):
     def __init__(self, targets=android_targets):
         prepare.Preparator.__init__(self, targets)
         self.min_supported_ndk = 10
-        self.max_supported_ndk = 11
+        self.max_supported_ndk = 12
         self.unsupported_ndk_version = None
         self.release_with_debug_info = True
         self.veryclean = True
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index a4fbcbee4..d9ec1a69d 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit a4fbcbee40e7c9b9ef3ec3f7b0e95e3440906d89
+Subproject commit d9ec1a69de814102d7d0bc6a044595fd98e288b8