Cherry pick - Move all Android machines to arm64. - android/next-release

Change-Id: If3f65a94c426ed659470a2f51b9a525f55e59473
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/447590
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
diff --git a/infra/bots/gen_tasks_logic/task_builder.go b/infra/bots/gen_tasks_logic/task_builder.go
index cdb846f..35a4356 100644
--- a/infra/bots/gen_tasks_logic/task_builder.go
+++ b/infra/bots/gen_tasks_logic/task_builder.go
@@ -278,9 +278,9 @@
 		return cipd.PlatformMacAmd64
 	} else if b.matchArch("Arm64") {
 		return cipd.PlatformLinuxArm64
-	} else if b.matchModel("GalaxyS20") || b.matchModel("P30") {
+	} else if b.matchOs("Android") {
 		return cipd.PlatformLinuxArm64
-	} else if b.matchOs("Android", "ChromeOS", "iOS") {
+	} else if b.matchOs("ChromeOS", "iOS") {
 		return cipd.PlatformLinuxArmv6l
 	} else {
 		return cipd.PlatformLinuxAmd64
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index fc8e86b..7fd44a2 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -19976,12 +19976,12 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -20065,12 +20065,12 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -20777,12 +20777,12 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -20866,12 +20866,12 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -20955,12 +20955,12 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -21044,12 +21044,12 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -21133,12 +21133,12 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -21222,12 +21222,12 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -21311,12 +21311,12 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -21400,12 +21400,12 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -21494,12 +21494,12 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -21583,12 +21583,12 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -21677,12 +21677,12 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -21766,12 +21766,12 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -22033,12 +22033,12 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -22122,12 +22122,12 @@
       "casSpec": "skpbench",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -22210,12 +22210,12 @@
       "casSpec": "skpbench",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -22298,12 +22298,12 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -22387,12 +22387,12 @@
       "casSpec": "skpbench",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -22475,12 +22475,12 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -22564,12 +22564,12 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -22653,12 +22653,12 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -22742,12 +22742,12 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -22831,12 +22831,12 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -22920,12 +22920,12 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -23009,12 +23009,12 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -23098,12 +23098,12 @@
       "casSpec": "skpbench",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -23186,12 +23186,12 @@
       "casSpec": "skpbench",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -23274,12 +23274,12 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -23363,12 +23363,12 @@
       "casSpec": "skpbench",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -23451,12 +23451,12 @@
       "casSpec": "skpbench",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -23539,12 +23539,12 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -23628,12 +23628,12 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -23717,12 +23717,12 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -33346,12 +33346,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -33441,12 +33441,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -34011,12 +34011,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -34106,12 +34106,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -34201,12 +34201,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -34296,12 +34296,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -34391,12 +34391,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -34486,12 +34486,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -34581,12 +34581,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -34676,12 +34676,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -34771,12 +34771,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -34866,12 +34866,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -34961,12 +34961,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -35056,12 +35056,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -35151,12 +35151,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -35246,12 +35246,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -35341,12 +35341,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -35436,12 +35436,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -35531,12 +35531,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -35626,12 +35626,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -35721,12 +35721,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -35816,12 +35816,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -35911,12 +35911,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -36006,12 +36006,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -36101,12 +36101,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -36861,12 +36861,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -36951,12 +36951,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -37046,12 +37046,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -37136,12 +37136,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -37231,12 +37231,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -37326,12 +37326,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -37421,12 +37421,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -37516,12 +37516,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -37611,12 +37611,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -37706,12 +37706,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -37801,12 +37801,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -37896,12 +37896,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -37991,12 +37991,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -38086,12 +38086,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -38181,12 +38181,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -38276,12 +38276,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -38371,12 +38371,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -38466,12 +38466,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -38561,12 +38561,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -38656,12 +38656,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -38751,12 +38751,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -38846,12 +38846,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -38941,12 +38941,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -39036,12 +39036,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -39131,12 +39131,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -39226,12 +39226,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -39321,12 +39321,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -39416,12 +39416,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -39511,12 +39511,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -39606,12 +39606,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -39701,12 +39701,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -39796,12 +39796,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -39891,12 +39891,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -39986,12 +39986,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -40081,12 +40081,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -40176,12 +40176,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-armv6l",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-armv6l",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },