diff --git a/prepare.py b/prepare.py
index a16d7c6b9..92057a5f0 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/bcmatroska2 b/submodules/bcmatroska2
index ca4a89930..e8a69bdc3 160000
--- a/submodules/bcmatroska2
+++ b/submodules/bcmatroska2
@@ -1 +1 @@
-Subproject commit ca4a89930dd8db94a60ae4a1dbf44a3710497429
+Subproject commit e8a69bdc3f8828cfd83b0938955132918364b175
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index d389b30b6..4c7216d73 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit d389b30b6c417d8bc7a79f561075a5c58871e3bc
+Subproject commit 4c7216d73b5d859d78f9a13ab83a5a8e1c3779fc
diff --git a/submodules/externals/libvpx b/submodules/externals/libvpx
index f16168c8e..8769bd6ef 160000
--- a/submodules/externals/libvpx
+++ b/submodules/externals/libvpx
@@ -1 +1 @@
-Subproject commit f16168c8ef95bf00d4e7d702832f8771646686ba
+Subproject commit 8769bd6efe75d36d5ce468be7721360726d90a6f