diff --git a/prepare.py b/prepare.py
index 992d8fd0a..873f886b4 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', 'x86'], virtual_targets=android_virtual_targets)
         self.min_supported_ndk = 11
-        self.max_supported_ndk = 15
+        self.max_supported_ndk = 17
         self.unsupported_ndk_version = None
         self.min_cmake_version = "3.7"
         self.release_with_debug_info = True
diff --git a/submodules/externals/libvpx b/submodules/externals/libvpx
index 22aa947d5..f16168c8e 160000
--- a/submodules/externals/libvpx
+++ b/submodules/externals/libvpx
@@ -1 +1 @@
-Subproject commit 22aa947d577adbdd9cbfa7bb92da599254bcfb8f
+Subproject commit f16168c8ef95bf00d4e7d702832f8771646686ba