Move armv7 CPU tests to Nexus 10.

The Android Ones are slow and there aren't enough to keep up.

BUG=skia:

Change-Id: Ib483dc31853c34c3cafca7c8a08193fd747f2094
Reviewed-on: https://skia-review.googlesource.com/9021
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>

2 files changed, 160 insertions, 160 deletions

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index 38a79271d3..2572d04f7b 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -69,8 +69,6 @@
   "Housekeeper-PerCommit",
   "Housekeeper-PerCommit-InfraTests",
   "Housekeeper-Weekly-RecreateSKPs",
-  "Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android",
-  "Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android",
   "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android",
   "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android",
   "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android",
@@ -79,6 +77,8 @@
   "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan",
   "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android",
   "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan",
+  "Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Debug-Android",
+  "Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android",
   "Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-Android",
   "Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android",
   "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android",
@@ -164,8 +164,6 @@
   "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release",
   "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug",
   "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Release",
-  "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android",
-  "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android",
   "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android",
   "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android",
   "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android",
@@ -175,6 +173,8 @@
   "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan",
   "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android",
   "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan",
+  "Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Debug-Android",
+  "Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android",
   "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-Android",
   "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android",
   "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android",
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index e2c11936fc..244341cf78 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -422,18 +422,6 @@
       ],
       "trigger": "weekly"
     },
-    "Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android": {
-      "priority": 0.8,
-      "tasks": [
-        "Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android"
-      ]
-    },
-    "Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android"
-      ]
-    },
     "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android": {
       "priority": 0.8,
       "tasks": [
@@ -482,6 +470,18 @@
         "Upload-Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan"
       ]
     },
+    "Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Debug-Android": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Debug-Android"
+      ]
+    },
+    "Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android"
+      ]
+    },
     "Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-Android": {
       "priority": 0.8,
       "tasks": [
@@ -992,18 +992,6 @@
         "Upload-Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Release"
       ]
     },
-    "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android"
-      ]
-    },
-    "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android"
-      ]
-    },
     "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android": {
       "priority": 0.8,
       "tasks": [
@@ -1058,6 +1046,18 @@
         "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan"
       ]
     },
+    "Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Debug-Android": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Debug-Android"
+      ]
+    },
+    "Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android"
+      ]
+    },
     "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-Android": {
       "priority": 0.8,
       "tasks": [
@@ -3716,7 +3716,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android": {
+    "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -3750,7 +3750,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android",
+        "buildername=Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -3766,7 +3766,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android": {
+    "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -3800,7 +3800,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android",
+        "buildername=Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -3816,7 +3816,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android": {
+    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -3835,11 +3835,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
-        "device_os:MOB30Q",
-        "device_type:sprout",
+        "device_os:MMB29M",
+        "device_type:heroqlteatt",
         "os:Android",
         "pool:Skia"
       ],
@@ -3850,7 +3850,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android",
+        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -3866,7 +3866,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android": {
+    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -3885,11 +3885,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-Android"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
-        "device_os:MOB30Q",
-        "device_type:sprout",
+        "device_os:MMB29M",
+        "device_type:heroqlteatt",
         "os:Android",
         "pool:Skia"
       ],
@@ -3900,7 +3900,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android",
+        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -3916,7 +3916,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android": {
+    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -3938,8 +3938,8 @@
         "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
-        "device_os:MMB29M",
-        "device_type:heroqlteatt",
+        "device_os:MRA58K",
+        "device_type:foster",
         "os:Android",
         "pool:Skia"
       ],
@@ -3950,7 +3950,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android",
+        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -3966,7 +3966,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android": {
+    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -3985,11 +3985,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
       ],
       "dimensions": [
-        "device_os:MMB29M",
-        "device_type:heroqlteatt",
+        "device_os:MRA58K",
+        "device_type:foster",
         "os:Android",
         "pool:Skia"
       ],
@@ -4000,7 +4000,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android",
+        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4016,7 +4016,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android": {
+    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4035,7 +4035,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
         "device_os:MRA58K",
@@ -4050,7 +4050,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android",
+        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4066,7 +4066,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan": {
+    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4085,7 +4085,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:MRA58K",
@@ -4100,7 +4100,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan",
+        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4116,7 +4116,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android": {
+    "Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4135,11 +4135,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android"
+        "Build-Ubuntu-Clang-arm-Debug-Android"
       ],
       "dimensions": [
-        "device_os:MRA58K",
-        "device_type:foster",
+        "device_os:LMY49J",
+        "device_type:manta",
         "os:Android",
         "pool:Skia"
       ],
@@ -4150,7 +4150,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android",
+        "buildername=Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4166,7 +4166,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan": {
+    "Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4185,11 +4185,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
+        "Build-Ubuntu-Clang-arm-Release-Android"
       ],
       "dimensions": [
-        "device_os:MRA58K",
-        "device_type:foster",
+        "device_os:LMY49J",
+        "device_type:manta",
         "os:Android",
         "pool:Skia"
       ],
@@ -4200,7 +4200,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan",
+        "buildername=Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8411,7 +8411,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android": {
+    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8445,7 +8445,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android",
+        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8461,7 +8461,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android": {
+    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8495,7 +8495,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android",
+        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8511,7 +8511,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android": {
+    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8530,11 +8530,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
-        "device_os:MOB30Q",
-        "device_type:sprout",
+        "device_os:MMB29M",
+        "device_type:heroqlteatt",
         "os:Android",
         "pool:Skia"
       ],
@@ -8545,7 +8545,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android",
+        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8561,7 +8561,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android": {
+    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8580,11 +8580,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-Android"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
-        "device_os:MOB30Q",
-        "device_type:sprout",
+        "device_os:MMB29M",
+        "device_type:heroqlteatt",
         "os:Android",
         "pool:Skia"
       ],
@@ -8595,7 +8595,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android",
+        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8611,7 +8611,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android": {
+    "Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8630,11 +8630,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android"
+        "Build-Ubuntu-Clang-arm-Debug-Android"
       ],
       "dimensions": [
-        "device_os:MMB29M",
-        "device_type:heroqlteatt",
+        "device_os:JDQ39",
+        "device_type:goyawifi",
         "os:Android",
         "pool:Skia"
       ],
@@ -8645,7 +8645,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android",
+        "buildername=Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8661,7 +8661,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android": {
+    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8680,11 +8680,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
-        "device_os:MMB29M",
-        "device_type:heroqlteatt",
+        "device_os:MRA58K",
+        "device_type:foster",
         "os:Android",
         "pool:Skia"
       ],
@@ -8695,7 +8695,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8711,7 +8711,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android": {
+    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8730,11 +8730,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
       ],
       "dimensions": [
-        "device_os:JDQ39",
-        "device_type:goyawifi",
+        "device_os:MRA58K",
+        "device_type:foster",
         "os:Android",
         "pool:Skia"
       ],
@@ -8745,7 +8745,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8761,7 +8761,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android": {
+    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8780,7 +8780,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
         "device_os:MRA58K",
@@ -8795,7 +8795,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8811,7 +8811,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan": {
+    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8830,7 +8830,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:MRA58K",
@@ -8845,7 +8845,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8861,7 +8861,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android": {
+    "Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8880,11 +8880,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android"
+        "Build-Ubuntu-Clang-arm-Debug-Android"
       ],
       "dimensions": [
-        "device_os:MRA58K",
-        "device_type:foster",
+        "device_os:LMY49J",
+        "device_type:manta",
         "os:Android",
         "pool:Skia"
       ],
@@ -8895,7 +8895,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android",
+        "buildername=Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8911,7 +8911,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan": {
+    "Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8930,11 +8930,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
+        "Build-Ubuntu-Clang-arm-Release-Android"
       ],
       "dimensions": [
-        "device_os:MRA58K",
-        "device_type:foster",
+        "device_os:LMY49J",
+        "device_type:manta",
         "os:Android",
         "pool:Skia"
       ],
@@ -8945,7 +8945,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13510,9 +13510,9 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android": {
+    "Upload-Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android": {
       "dependencies": [
-        "Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android"
+        "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13525,7 +13525,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android",
+        "buildername=Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13540,9 +13540,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android": {
+    "Upload-Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android": {
       "dependencies": [
-        "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android"
+        "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13555,7 +13555,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android",
+        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13570,9 +13570,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android": {
+    "Upload-Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android": {
       "dependencies": [
-        "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android"
+        "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13585,7 +13585,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android",
+        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13600,9 +13600,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android": {
+    "Upload-Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan": {
       "dependencies": [
-        "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android"
+        "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13615,7 +13615,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android",
+        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13630,9 +13630,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan": {
+    "Upload-Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android": {
       "dependencies": [
-        "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan"
+        "Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13645,7 +13645,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan",
+        "buildername=Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14800,9 +14800,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android": {
+    "Upload-Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android": {
       "dependencies": [
-        "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android"
+        "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14815,7 +14815,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android",
+        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14830,9 +14830,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android": {
+    "Upload-Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android": {
       "dependencies": [
-        "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android"
+        "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14845,7 +14845,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android",
+        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14860,9 +14860,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android": {
+    "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android": {
       "dependencies": [
-        "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android"
+        "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14875,7 +14875,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android",
+        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14890,9 +14890,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android": {
+    "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android": {
       "dependencies": [
-        "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android"
+        "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14905,7 +14905,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android",
+        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14920,9 +14920,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android": {
+    "Upload-Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android": {
       "dependencies": [
-        "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android"
+        "Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14935,7 +14935,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android",
+        "buildername=Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14950,9 +14950,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android": {
+    "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android": {
       "dependencies": [
-        "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android"
+        "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14965,7 +14965,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14980,9 +14980,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android": {
+    "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan": {
       "dependencies": [
-        "Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android"
+        "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14995,7 +14995,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -15010,9 +15010,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android": {
+    "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android": {
       "dependencies": [
-        "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android"
+        "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -15025,7 +15025,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -15040,9 +15040,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan": {
+    "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan": {
       "dependencies": [
-        "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan"
+        "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -15055,7 +15055,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -15070,9 +15070,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android": {
+    "Upload-Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Debug-Android": {
       "dependencies": [
-        "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android"
+        "Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Debug-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -15085,7 +15085,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android",
+        "buildername=Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -15100,9 +15100,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan": {
+    "Upload-Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android": {
       "dependencies": [
-        "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan"
+        "Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -15115,7 +15115,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",