Update bots to NDK r14.

CQ_INCLUDE_TRYBOTS=skia.primary:Build-Mac-Clang-arm64-Debug-Android,Build-Ubuntu-Clang-arm-Debug-Android,Build-Ubuntu-Clang-arm64-Debug-Android,Build-Ubuntu-Clang-mips64el-Debug-Android,Build-Ubuntu-Clang-mipsel-Debug-Android,Build-Ubuntu-Clang-x64-Debug-Android,Build-Ubuntu-Clang-x86-Debug-Android,Build-Win-Clang-arm64-Release-Android

Change-Id: I31df35c3d73b80f465cc063f2a1a7a526172cd67
Reviewed-on: https://skia-review.googlesource.com/9293
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>

7 files changed, 26 insertions, 26 deletions

diff --git a/infra/bots/assets/android_ndk_darwin/VERSION b/infra/bots/assets/android_ndk_darwin/VERSION
index 56a6051ca2..d8263ee986 100644
--- a/infra/bots/assets/android_ndk_darwin/VERSION
+++ b/infra/bots/assets/android_ndk_darwin/VERSION
@@ -1 +1 @@
-1
\ No newline at end of file
+2
\ 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 99165d4b87..cd427d365d 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-r13"
+NDK_VER = "android-ndk-r14"
 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 7813681f5b..c7930257df 100644
--- a/infra/bots/assets/android_ndk_linux/VERSION
+++ b/infra/bots/assets/android_ndk_linux/VERSION
@@ -1 +1 @@
-5
\ No newline at end of file
+7
\ 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 62652abf53..d785f48958 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-r13"
+NDK_VER = "android-ndk-r14"
 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 d8263ee986..e440e5c842 100644
--- a/infra/bots/assets/android_ndk_windows/VERSION
+++ b/infra/bots/assets/android_ndk_windows/VERSION
@@ -1 +1 @@
-2
\ No newline at end of file
+3
\ 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 8c28befef7..eb3cae50e2 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-r13"
+NDK_VER = "android-ndk-r14"
 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 c061ccc5da..02e1c8bd67 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -1764,7 +1764,7 @@
         {
           "name": "skia/bots/android_ndk_darwin",
           "path": "android_ndk_darwin",
-          "version": "version:1"
+          "version": "version:2"
         }
       ],
       "dimensions": [
@@ -1946,7 +1946,7 @@
         {
           "name": "skia/bots/android_ndk_linux",
           "path": "android_ndk_linux",
-          "version": "version:5"
+          "version": "version:7"
         }
       ],
       "dimensions": [
@@ -1978,7 +1978,7 @@
         {
           "name": "skia/bots/android_ndk_linux",
           "path": "android_ndk_linux",
-          "version": "version:5"
+          "version": "version:7"
         }
       ],
       "dimensions": [
@@ -2010,7 +2010,7 @@
         {
           "name": "skia/bots/android_ndk_linux",
           "path": "android_ndk_linux",
-          "version": "version:5"
+          "version": "version:7"
         }
       ],
       "dimensions": [
@@ -2042,7 +2042,7 @@
         {
           "name": "skia/bots/android_ndk_linux",
           "path": "android_ndk_linux",
-          "version": "version:5"
+          "version": "version:7"
         }
       ],
       "dimensions": [
@@ -2074,7 +2074,7 @@
         {
           "name": "skia/bots/android_ndk_linux",
           "path": "android_ndk_linux",
-          "version": "version:5"
+          "version": "version:7"
         }
       ],
       "dimensions": [
@@ -2106,7 +2106,7 @@
         {
           "name": "skia/bots/android_ndk_linux",
           "path": "android_ndk_linux",
-          "version": "version:5"
+          "version": "version:7"
         }
       ],
       "dimensions": [
@@ -2138,7 +2138,7 @@
         {
           "name": "skia/bots/android_ndk_linux",
           "path": "android_ndk_linux",
-          "version": "version:5"
+          "version": "version:7"
         }
       ],
       "dimensions": [
@@ -2170,7 +2170,7 @@
         {
           "name": "skia/bots/android_ndk_linux",
           "path": "android_ndk_linux",
-          "version": "version:5"
+          "version": "version:7"
         }
       ],
       "dimensions": [
@@ -2202,7 +2202,7 @@
         {
           "name": "skia/bots/android_ndk_linux",
           "path": "android_ndk_linux",
-          "version": "version:5"
+          "version": "version:7"
         }
       ],
       "dimensions": [
@@ -2234,7 +2234,7 @@
         {
           "name": "skia/bots/android_ndk_linux",
           "path": "android_ndk_linux",
-          "version": "version:5"
+          "version": "version:7"
         }
       ],
       "dimensions": [
@@ -2266,7 +2266,7 @@
         {
           "name": "skia/bots/android_ndk_linux",
           "path": "android_ndk_linux",
-          "version": "version:5"
+          "version": "version:7"
         }
       ],
       "dimensions": [
@@ -2298,7 +2298,7 @@
         {
           "name": "skia/bots/android_ndk_linux",
           "path": "android_ndk_linux",
-          "version": "version:5"
+          "version": "version:7"
         }
       ],
       "dimensions": [
@@ -2330,7 +2330,7 @@
         {
           "name": "skia/bots/android_ndk_linux",
           "path": "android_ndk_linux",
-          "version": "version:5"
+          "version": "version:7"
         }
       ],
       "dimensions": [
@@ -2362,7 +2362,7 @@
         {
           "name": "skia/bots/android_ndk_linux",
           "path": "android_ndk_linux",
-          "version": "version:5"
+          "version": "version:7"
         }
       ],
       "dimensions": [
@@ -2394,7 +2394,7 @@
         {
           "name": "skia/bots/android_ndk_linux",
           "path": "android_ndk_linux",
-          "version": "version:5"
+          "version": "version:7"
         }
       ],
       "dimensions": [
@@ -2426,7 +2426,7 @@
         {
           "name": "skia/bots/android_ndk_linux",
           "path": "android_ndk_linux",
-          "version": "version:5"
+          "version": "version:7"
         }
       ],
       "dimensions": [
@@ -2458,7 +2458,7 @@
         {
           "name": "skia/bots/android_ndk_linux",
           "path": "android_ndk_linux",
-          "version": "version:5"
+          "version": "version:7"
         }
       ],
       "dimensions": [
@@ -2995,7 +2995,7 @@
         {
           "name": "skia/bots/android_ndk_linux",
           "path": "android_ndk_linux",
-          "version": "version:5"
+          "version": "version:7"
         }
       ],
       "dimensions": [
@@ -3177,7 +3177,7 @@
         {
           "name": "skia/bots/android_ndk_windows",
           "path": "n",
-          "version": "version:2"
+          "version": "version:3"
         }
       ],
       "dimensions": [