8 files changed, 12 insertions, 10 deletions
diff --git a/gn/BUILD.gn b/gn/BUILD.gn
index 4c6eac27b0..ac036c28ee 100644
--- a/gn/BUILD.gn
+++ b/gn/BUILD.gn
@@ -169,8 +169,10 @@ config("default") {
     libs += [
       "c++_static",
       "c++abi",
-      "android_support",
     ]
+    if (ndk_api < 21) {
+      libs += [ "android_support" ]
+    }
   }
 
   if (is_ios) {
diff --git a/infra/bots/assets/android_ndk_darwin/VERSION b/infra/bots/assets/android_ndk_darwin/VERSION
index bf0d87ab1b..7813681f5b 100644
--- a/infra/bots/assets/android_ndk_darwin/VERSION
+++ b/infra/bots/assets/android_ndk_darwin/VERSION
@@ -1 +1 @@
-4
-\ No newline at end of file
+5
+\ No newline at end of file
diff --git a/infra/bots/assets/android_ndk_darwin/create.py b/infra/bots/assets/android_ndk_darwin/create.py
index 1495e78dea..809f755e2d 100755
--- a/infra/bots/assets/android_ndk_darwin/create.py
+++ b/infra/bots/assets/android_ndk_darwin/create.py
@@ -15,7 +15,7 @@ import os.path
 import shutil
 import subprocess
 
-NDK_VER = "android-ndk-r15b"
+NDK_VER = "android-ndk-r17"
 NDK_URL = \
     "https://dl.google.com/android/repository/%s-darwin-x86_64.zip" % NDK_VER
 
diff --git a/infra/bots/assets/android_ndk_linux/VERSION b/infra/bots/assets/android_ndk_linux/VERSION
index 9a037142aa..9d607966b7 100644
--- a/infra/bots/assets/android_ndk_linux/VERSION
+++ b/infra/bots/assets/android_ndk_linux/VERSION
@@ -1 +1 @@
-10
-\ No newline at end of file
+11
+\ No newline at end of file
diff --git a/infra/bots/assets/android_ndk_linux/create.py b/infra/bots/assets/android_ndk_linux/create.py
index 79ab6d0a1a..2af2905b1b 100755
--- a/infra/bots/assets/android_ndk_linux/create.py
+++ b/infra/bots/assets/android_ndk_linux/create.py
@@ -15,7 +15,7 @@ import os.path
 import shutil
 import subprocess
 
-NDK_VER = "android-ndk-r15b"
+NDK_VER = "android-ndk-r17"
 NDK_URL = \
     "https://dl.google.com/android/repository/%s-linux-x86_64.zip" % NDK_VER
 
diff --git a/infra/bots/assets/android_ndk_windows/VERSION b/infra/bots/assets/android_ndk_windows/VERSION
index 7813681f5b..62f9457511 100644
--- a/infra/bots/assets/android_ndk_windows/VERSION
+++ b/infra/bots/assets/android_ndk_windows/VERSION
@@ -1 +1 @@
-5
-\ No newline at end of file
+6
+\ No newline at end of file
diff --git a/infra/bots/assets/android_ndk_windows/create.py b/infra/bots/assets/android_ndk_windows/create.py
index 063244b4d7..9336a5edfa 100755
--- a/infra/bots/assets/android_ndk_windows/create.py
+++ b/infra/bots/assets/android_ndk_windows/create.py
@@ -15,7 +15,7 @@ import os.path
 import shutil
 import subprocess
 
-NDK_VER = "android-ndk-r15b"
+NDK_VER = "android-ndk-r17"
 NDK_URL = \
     "https://dl.google.com/android/repository/%s-windows-x86_64.zip" % NDK_VER
 
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index b1580afae3..cb695a2b77 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -12631,7 +12631,7 @@
         {
           "name": "skia/bots/android_ndk_darwin",
           "path": "android_ndk_darwin",
-          "version": "version:4"
+          "version": "version:5"
         }
       ],
       "command": [
@@ -14000,7 +14000,7 @@
         {
           "name": "skia/bots/android_ndk_windows",
           "path": "n",
-          "version": "version:5"
+          "version": "version:6"
         }
       ],
       "command": [
@@ -17428,7 +17428,7 @@
         {
           "name": "skia/bots/android_ndk_linux",
           "path": "android_ndk_linux",
-          "version": "version:10"
+          "version": "version:11"
         }
       ],
       "command": [