diff --git a/prepare.py b/prepare.py
index 100dde4ad..ea19073b6 100755
--- a/prepare.py
+++ b/prepare.py
@@ -104,7 +104,7 @@ class AndroidPreparator(prepare.Preparator):
     def __init__(self, targets=android_targets):
         prepare.Preparator.__init__(self, targets, default_targets=['armv7', 'arm64'], virtual_targets=android_virtual_targets)
         self.min_supported_ndk = 16
-        self.max_supported_ndk = 17
+        self.max_supported_ndk = 18
         self.unsupported_ndk_version = None
         self.min_cmake_version = "3.10"
         self.release_with_debug_info = True
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 6764f88ec..4c7216d73 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 6764f88ecd5fee5518caeeb4a3c54649ab0e6160
+Subproject commit 4c7216d73b5d859d78f9a13ab83a5a8e1c3779fc
diff --git a/submodules/externals/libvpx b/submodules/externals/libvpx
index 09752a27e..8769bd6ef 160000
--- a/submodules/externals/libvpx
+++ b/submodules/externals/libvpx
@@ -1 +1 @@
-Subproject commit 09752a27e5e32613bf5cdcfd6e128bd1b688ca6f
+Subproject commit 8769bd6efe75d36d5ce468be7721360726d90a6f