Remove redundant -GN bot suffixes.

The GN in the name only matters for iOS bots now.  All the others are GN-only.

This revealed a couple redundant build bots: we had two each of Win x86_64 Debug and Release builders, one with -GN and one not.

I have intentionally not resorted gen_tasks.go to keep the diff looking somewhat sane.  I'd be happy to sort here or to follow up with a re-sort CL.

Change-Id: I2f8a136a1fbde416739966e27685b52b94b50cf6
Reviewed-on: https://skia-review.googlesource.com/5545
Reviewed-by: Eric Boren <borenet@google.com>

diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 0852dbd..2a08635 100644 (file)
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -39,40 +39,40 @@ var (
        JOBS = []string{
                "Build-Mac-Clang-Arm7-Debug-iOS",
                "Build-Mac-Clang-Arm7-Release-iOS",
-               "Build-Mac-Clang-arm64-Debug-GN_Android",
+               "Build-Mac-Clang-arm64-Debug-Android",
                "Build-Mac-Clang-arm64-Debug-GN_iOS",
-               "Build-Mac-Clang-x86_64-Debug-GN",
-               "Build-Mac-Clang-x86_64-Release-GN",
-               "Build-Ubuntu-Clang-arm-Debug-GN_Android",
-               "Build-Ubuntu-Clang-arm-Release-GN_Android",
-               "Build-Ubuntu-Clang-arm64-Debug-GN_Android",
-               "Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs",
-               "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan",
-               "Build-Ubuntu-Clang-arm64-Release-GN_Android",
-               "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan",
-               "Build-Ubuntu-Clang-mips64el-Debug-GN_Android",
-               "Build-Ubuntu-Clang-mips64el-Release-GN_Android",
-               "Build-Ubuntu-Clang-mipsel-Debug-GN_Android",
-               "Build-Ubuntu-Clang-mipsel-Release-GN_Android",
-               "Build-Ubuntu-Clang-x64-Debug-GN_Android",
-               "Build-Ubuntu-Clang-x64-Release-GN_Android",
-               "Build-Ubuntu-Clang-x86-Debug-GN_Android",
-               "Build-Ubuntu-Clang-x86-Debug-GN_Android_Vulkan",
-               "Build-Ubuntu-Clang-x86-Release-GN_Android",
-               "Build-Ubuntu-Clang-x86-Release-GN_Android_Vulkan",
-               "Build-Ubuntu-Clang-x86_64-Debug-GN",
-               "Build-Ubuntu-Clang-x86_64-Release-GN",
+               "Build-Mac-Clang-x86_64-Debug",
+               "Build-Mac-Clang-x86_64-Release",
+               "Build-Ubuntu-Clang-arm-Debug-Android",
+               "Build-Ubuntu-Clang-arm-Release-Android",
+               "Build-Ubuntu-Clang-arm64-Debug-Android",
+               "Build-Ubuntu-Clang-arm64-Debug-Android_FrameworkDefs",
+               "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan",
+               "Build-Ubuntu-Clang-arm64-Release-Android",
+               "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan",
+               "Build-Ubuntu-Clang-mips64el-Debug-Android",
+               "Build-Ubuntu-Clang-mips64el-Release-Android",
+               "Build-Ubuntu-Clang-mipsel-Debug-Android",
+               "Build-Ubuntu-Clang-mipsel-Release-Android",
+               "Build-Ubuntu-Clang-x64-Debug-Android",
+               "Build-Ubuntu-Clang-x64-Release-Android",
+               "Build-Ubuntu-Clang-x86-Debug-Android",
+               "Build-Ubuntu-Clang-x86-Debug-Android_Vulkan",
+               "Build-Ubuntu-Clang-x86-Release-Android",
+               "Build-Ubuntu-Clang-x86-Release-Android_Vulkan",
+               "Build-Ubuntu-Clang-x86_64-Debug",
+               "Build-Ubuntu-Clang-x86_64-Release",
                "Build-Ubuntu-GCC-x86-Debug",
                "Build-Ubuntu-GCC-x86-Release",
-               "Build-Ubuntu-GCC-x86_64-Debug-GN",
+               "Build-Ubuntu-GCC-x86_64-Debug",
                "Build-Ubuntu-GCC-x86_64-Debug-NoGPU",
+               "Build-Ubuntu-GCC-x86_64-Release",
                "Build-Ubuntu-GCC-x86_64-Release-ANGLE",
-               "Build-Ubuntu-GCC-x86_64-Release-GN",
                "Build-Ubuntu-GCC-x86_64-Release-Mesa",
                "Build-Ubuntu-GCC-x86_64-Release-NoGPU",
                "Build-Ubuntu-GCC-x86_64-Release-PDFium",
                "Build-Ubuntu-GCC-x86_64-Release-Valgrind",
-               "Build-Win-Clang-arm64-Release-GN_Android",
+               "Build-Win-Clang-arm64-Release-Android",
                "Build-Win-MSVC-x86-Debug",
                "Build-Win-MSVC-x86-Debug-ANGLE",
                "Build-Win-MSVC-x86-Debug-Exceptions",
@@ -81,73 +81,71 @@ var (
                "Build-Win-MSVC-x86-Release-ANGLE",
                "Build-Win-MSVC-x86-Release-GDI",
                "Build-Win-MSVC-x86_64-Debug",
-               "Build-Win-MSVC-x86_64-Debug-GN",
                "Build-Win-MSVC-x86_64-Release",
-               "Build-Win-MSVC-x86_64-Release-GN",
                "Build-Win-MSVC-x86_64-Release-Vulkan",
                "Housekeeper-Nightly-RecreateSKPs_Canary",
                "Housekeeper-PerCommit",
                "Housekeeper-PerCommit-InfraTests",
                "Housekeeper-Weekly-RecreateSKPs",
-               "Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android",
-               "Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android",
-               "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android",
-               "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android",
-               "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android",
-               "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan",
-               "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android",
-               "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
-               "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android",
-               "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan",
-               "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android",
-               "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan",
-               "Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android",
-               "Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android",
-               "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android",
-               "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android",
-               "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android",
-               "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android",
-               "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android",
-               "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan",
-               "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android",
-               "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan",
-               "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android",
-               "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android",
-               "Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android",
-               "Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android",
-               "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android",
-               "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android",
-               "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android",
-               "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan",
-               "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android",
-               "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan",
-               "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-GN_Android",
-               "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan",
-               "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android",
-               "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
-               "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench",
-               "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench",
-               "Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug-GN",
-               "Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN",
-               "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug-GN",
-               "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN",
-               "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-GN",
+               "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",
+               "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android_Vulkan",
+               "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android",
+               "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan",
+               "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android",
+               "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-GPU-MaliT604-arm-Debug-Android",
+               "Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android",
+               "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android",
+               "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android",
+               "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-Android",
+               "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android",
+               "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android",
+               "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan",
+               "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android",
+               "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan",
+               "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android",
+               "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android",
+               "Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-Android",
+               "Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android",
+               "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android",
+               "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android",
+               "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android",
+               "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan",
+               "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android",
+               "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan",
+               "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-Android",
+               "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-Android_Vulkan",
+               "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android",
+               "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android_Vulkan",
+               "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Skpbench",
+               "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Vulkan_Skpbench",
+               "Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug",
+               "Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release",
+               "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug",
+               "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
+               "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug",
+               "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release",
                "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-CommandBuffer",
-               "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN",
+               "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug",
                "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN",
-               "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN",
                "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN",
-               "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN",
+               "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release",
                "Perf-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN",
                "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug",
-               "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN",
+               "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
                "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
+               "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release",
                "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs",
-               "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN",
                "Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs",
                "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
-               "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug-GN",
-               "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN",
+               "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug",
+               "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
                "Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release",
                "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
                "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
@@ -171,68 +169,68 @@ var (
                "Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release",
                "Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug",
                "Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release",
-               "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android",
-               "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android",
-               "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android",
-               "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android",
-               "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android",
-               "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan",
-               "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android",
-               "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
-               "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android",
-               "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan",
-               "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android",
-               "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan",
-               "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android",
-               "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android",
-               "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android",
-               "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android",
-               "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android",
-               "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android",
-               "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android",
-               "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan",
-               "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android",
-               "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan",
-               "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android",
-               "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android",
-               "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android",
-               "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android",
-               "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android",
-               "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android",
-               "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android",
-               "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan",
-               "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android",
-               "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan",
-               "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android",
-               "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan",
-               "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android",
-               "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
-               "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug-GN",
-               "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN",
-               "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug-GN",
-               "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN",
+               "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",
+               "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android_Vulkan",
+               "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android",
+               "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan",
+               "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android",
+               "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-GPU-MaliT604-arm-Debug-Android",
+               "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android",
+               "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android",
+               "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android",
+               "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-Android",
+               "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android",
+               "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android",
+               "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan",
+               "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android",
+               "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan",
+               "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android",
+               "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android",
+               "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-Android",
+               "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android",
+               "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android",
+               "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android",
+               "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android",
+               "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan",
+               "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android",
+               "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan",
+               "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android",
+               "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android_Vulkan",
+               "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android",
+               "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android_Vulkan",
+               "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug",
+               "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release",
+               "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug",
+               "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
+               "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug",
                "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer",
-               "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-GN",
-               "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN",
+               "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release",
+               "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug",
                "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN",
-               "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN",
                "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN",
-               "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN",
+               "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release",
                "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN",
                "Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN",
                "Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Release-TSAN",
                "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug",
+               "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
                "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs",
                "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs",
                "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs",
-               "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN",
                "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
+               "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release",
                "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast",
-               "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN",
                "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD",
                "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
-               "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug-GN",
-               "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN",
+               "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug",
+               "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
                "Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release",
                "Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
                "Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
@@ -284,8 +282,6 @@ func deriveCompileTaskName(jobName string, parts map[string]string) string {
                if task_os == "Android" {
                        if ec == "Vulkan" {
                                ec = "Android_Vulkan"
-                       } else if !strings.Contains(ec, "GN_Android") {
-                               ec = task_os
                        }
                        task_os = "Ubuntu"
                } else if task_os == "iOS" {

diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 8e25429..efe26f2 100644 (file)
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -12,10 +12,10 @@
         "Build-Mac-Clang-Arm7-Release-iOS"
       ]
     },
-    "Build-Mac-Clang-arm64-Debug-GN_Android": {
+    "Build-Mac-Clang-arm64-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Build-Mac-Clang-arm64-Debug-GN_Android"
+        "Build-Mac-Clang-arm64-Debug-Android"
       ]
     },
     "Build-Mac-Clang-arm64-Debug-GN_iOS": {
@@ -24,16 +24,22 @@
         "Build-Mac-Clang-arm64-Debug-GN_iOS"
       ]
     },
+    "Build-Mac-Clang-x86_64-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Mac-Clang-x86_64-Debug"
+      ]
+    },
     "Build-Mac-Clang-x86_64-Debug-CommandBuffer": {
       "priority": 0.8,
       "tasks": [
         "Build-Mac-Clang-x86_64-Debug-CommandBuffer"
       ]
     },
-    "Build-Mac-Clang-x86_64-Debug-GN": {
+    "Build-Mac-Clang-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Build-Mac-Clang-x86_64-Debug-GN"
+        "Build-Mac-Clang-x86_64-Release"
       ]
     },
     "Build-Mac-Clang-x86_64-Release-CommandBuffer": {
@@ -42,112 +48,112 @@
         "Build-Mac-Clang-x86_64-Release-CommandBuffer"
       ]
     },
-    "Build-Mac-Clang-x86_64-Release-GN": {
+    "Build-Ubuntu-Clang-arm-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Build-Mac-Clang-x86_64-Release-GN"
+        "Build-Ubuntu-Clang-arm-Debug-Android"
       ]
     },
-    "Build-Ubuntu-Clang-arm-Debug-GN_Android": {
+    "Build-Ubuntu-Clang-arm-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm-Release-Android"
       ]
     },
-    "Build-Ubuntu-Clang-arm-Release-GN_Android": {
+    "Build-Ubuntu-Clang-arm64-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Build-Ubuntu-Clang-arm-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android"
       ]
     },
-    "Build-Ubuntu-Clang-arm64-Debug-GN_Android": {
+    "Build-Ubuntu-Clang-arm64-Debug-Android_FrameworkDefs": {
       "priority": 0.8,
       "tasks": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android_FrameworkDefs"
       ]
     },
-    "Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs": {
+    "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs"
+        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
       ]
     },
-    "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan": {
+    "Build-Ubuntu-Clang-arm64-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ]
     },
-    "Build-Ubuntu-Clang-arm64-Release-GN_Android": {
+    "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
       ]
     },
-    "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan": {
+    "Build-Ubuntu-Clang-mips64el-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-mips64el-Debug-Android"
       ]
     },
-    "Build-Ubuntu-Clang-mips64el-Debug-GN_Android": {
+    "Build-Ubuntu-Clang-mips64el-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Build-Ubuntu-Clang-mips64el-Debug-GN_Android"
+        "Build-Ubuntu-Clang-mips64el-Release-Android"
       ]
     },
-    "Build-Ubuntu-Clang-mips64el-Release-GN_Android": {
+    "Build-Ubuntu-Clang-mipsel-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Build-Ubuntu-Clang-mips64el-Release-GN_Android"
+        "Build-Ubuntu-Clang-mipsel-Debug-Android"
       ]
     },
-    "Build-Ubuntu-Clang-mipsel-Debug-GN_Android": {
+    "Build-Ubuntu-Clang-mipsel-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Build-Ubuntu-Clang-mipsel-Debug-GN_Android"
+        "Build-Ubuntu-Clang-mipsel-Release-Android"
       ]
     },
-    "Build-Ubuntu-Clang-mipsel-Release-GN_Android": {
+    "Build-Ubuntu-Clang-x64-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Build-Ubuntu-Clang-mipsel-Release-GN_Android"
+        "Build-Ubuntu-Clang-x64-Debug-Android"
       ]
     },
-    "Build-Ubuntu-Clang-x64-Debug-GN_Android": {
+    "Build-Ubuntu-Clang-x64-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Build-Ubuntu-Clang-x64-Debug-GN_Android"
+        "Build-Ubuntu-Clang-x64-Release-Android"
       ]
     },
-    "Build-Ubuntu-Clang-x64-Release-GN_Android": {
+    "Build-Ubuntu-Clang-x86-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Build-Ubuntu-Clang-x64-Release-GN_Android"
+        "Build-Ubuntu-Clang-x86-Debug-Android"
       ]
     },
-    "Build-Ubuntu-Clang-x86-Debug-GN_Android": {
+    "Build-Ubuntu-Clang-x86-Debug-Android_Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Build-Ubuntu-Clang-x86-Debug-GN_Android"
+        "Build-Ubuntu-Clang-x86-Debug-Android_Vulkan"
       ]
     },
-    "Build-Ubuntu-Clang-x86-Debug-GN_Android_Vulkan": {
+    "Build-Ubuntu-Clang-x86-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Build-Ubuntu-Clang-x86-Debug-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-x86-Release-Android"
       ]
     },
-    "Build-Ubuntu-Clang-x86-Release-GN_Android": {
+    "Build-Ubuntu-Clang-x86-Release-Android_Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Build-Ubuntu-Clang-x86-Release-GN_Android"
+        "Build-Ubuntu-Clang-x86-Release-Android_Vulkan"
       ]
     },
-    "Build-Ubuntu-Clang-x86-Release-GN_Android_Vulkan": {
+    "Build-Ubuntu-Clang-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Build-Ubuntu-Clang-x86-Release-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-x86_64-Debug"
       ]
     },
     "Build-Ubuntu-Clang-x86_64-Debug-ASAN": {
@@ -156,22 +162,16 @@
         "Build-Ubuntu-Clang-x86_64-Debug-ASAN"
       ]
     },
-    "Build-Ubuntu-Clang-x86_64-Debug-GN": {
-      "priority": 0.8,
-      "tasks": [
-        "Build-Ubuntu-Clang-x86_64-Debug-GN"
-      ]
-    },
     "Build-Ubuntu-Clang-x86_64-Debug-MSAN": {
       "priority": 0.8,
       "tasks": [
         "Build-Ubuntu-Clang-x86_64-Debug-MSAN"
       ]
     },
-    "Build-Ubuntu-Clang-x86_64-Release-GN": {
+    "Build-Ubuntu-Clang-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Build-Ubuntu-Clang-x86_64-Release-GN"
+        "Build-Ubuntu-Clang-x86_64-Release"
       ]
     },
     "Build-Ubuntu-Clang-x86_64-Release-TSAN": {
@@ -192,10 +192,10 @@
         "Build-Ubuntu-GCC-x86-Release"
       ]
     },
-    "Build-Ubuntu-GCC-x86_64-Debug-GN": {
+    "Build-Ubuntu-GCC-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Build-Ubuntu-GCC-x86_64-Debug-GN"
+        "Build-Ubuntu-GCC-x86_64-Debug"
       ]
     },
     "Build-Ubuntu-GCC-x86_64-Debug-NoGPU": {
@@ -210,22 +210,22 @@
         "Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
       ]
     },
-    "Build-Ubuntu-GCC-x86_64-Release-ANGLE": {
+    "Build-Ubuntu-GCC-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Build-Ubuntu-GCC-x86_64-Release-ANGLE"
+        "Build-Ubuntu-GCC-x86_64-Release"
       ]
     },
-    "Build-Ubuntu-GCC-x86_64-Release-Fast": {
+    "Build-Ubuntu-GCC-x86_64-Release-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Build-Ubuntu-GCC-x86_64-Release-Fast"
+        "Build-Ubuntu-GCC-x86_64-Release-ANGLE"
       ]
     },
-    "Build-Ubuntu-GCC-x86_64-Release-GN": {
+    "Build-Ubuntu-GCC-x86_64-Release-Fast": {
       "priority": 0.8,
       "tasks": [
-        "Build-Ubuntu-GCC-x86_64-Release-GN"
+        "Build-Ubuntu-GCC-x86_64-Release-Fast"
       ]
     },
     "Build-Ubuntu-GCC-x86_64-Release-Mesa": {
@@ -264,10 +264,10 @@
         "Build-Ubuntu-GCC-x86_64-Release-Valgrind"
       ]
     },
-    "Build-Win-Clang-arm64-Release-GN_Android": {
+    "Build-Win-Clang-arm64-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Build-Win-Clang-arm64-Release-GN_Android"
+        "Build-Win-Clang-arm64-Release-Android"
       ]
     },
     "Build-Win-MSVC-x86-Debug": {
@@ -330,12 +330,6 @@
         "Build-Win-MSVC-x86_64-Debug-GDI"
       ]
     },
-    "Build-Win-MSVC-x86_64-Debug-GN": {
-      "priority": 0.8,
-      "tasks": [
-        "Build-Win-MSVC-x86_64-Debug-GN"
-      ]
-    },
     "Build-Win-MSVC-x86_64-Debug-Vulkan": {
       "priority": 0.8,
       "tasks": [
@@ -360,12 +354,6 @@
         "Build-Win-MSVC-x86_64-Release-GDI"
       ]
     },
-    "Build-Win-MSVC-x86_64-Release-GN": {
-      "priority": 0.8,
-      "tasks": [
-        "Build-Win-MSVC-x86_64-Release-GN"
-      ]
-    },
     "Build-Win-MSVC-x86_64-Release-Vulkan": {
       "priority": 0.8,
       "tasks": [
@@ -398,286 +386,286 @@
       ],
       "trigger": "weekly"
     },
-    "Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android": {
+    "Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android"
+        "Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android"
       ]
     },
-    "Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android": {
+    "Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android"
+        "Upload-Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android"
       ]
     },
-    "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android": {
+    "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android"
+        "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android"
       ]
     },
-    "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android": {
+    "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android"
+        "Upload-Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android"
       ]
     },
-    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android": {
+    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android"
+        "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android"
       ]
     },
-    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan": {
+    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android_Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan"
+        "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android_Vulkan"
       ]
     },
-    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android": {
+    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android"
+        "Upload-Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android"
       ]
     },
-    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
+    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan"
+        "Upload-Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan"
       ]
     },
-    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android": {
+    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android"
+        "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android"
       ]
     },
-    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan": {
+    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan"
+        "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan"
       ]
     },
-    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android": {
+    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android"
+        "Upload-Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android"
       ]
     },
-    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan": {
+    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan"
+        "Upload-Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan"
       ]
     },
-    "Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android": {
+    "Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android"
+        "Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-Android"
       ]
     },
-    "Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android": {
+    "Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android"
+        "Upload-Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android"
       ]
     },
-    "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android": {
+    "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android"
+        "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android"
       ]
     },
-    "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android": {
+    "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android"
+        "Upload-Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android"
       ]
     },
-    "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android": {
+    "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android"
+        "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-Android"
       ]
     },
-    "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android": {
+    "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android"
+        "Upload-Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android"
       ]
     },
-    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android": {
+    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android"
+        "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android"
       ]
     },
-    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan": {
+    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan"
+        "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan"
       ]
     },
-    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android": {
+    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android"
+        "Upload-Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android"
       ]
     },
-    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan": {
+    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan"
+        "Upload-Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan"
       ]
     },
-    "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android": {
+    "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android"
+        "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android"
       ]
     },
-    "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android": {
+    "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android"
+        "Upload-Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android"
       ]
     },
-    "Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android": {
+    "Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android"
+        "Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-Android"
       ]
     },
-    "Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android": {
+    "Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android"
+        "Upload-Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android"
       ]
     },
-    "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android": {
+    "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android"
+        "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android"
       ]
     },
-    "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android": {
+    "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android"
+        "Upload-Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android"
       ]
     },
-    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android": {
+    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android"
+        "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android"
       ]
     },
-    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan": {
+    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan"
+        "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan"
       ]
     },
-    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android": {
+    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android"
+        "Upload-Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android"
       ]
     },
-    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan": {
+    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan"
+        "Upload-Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan"
       ]
     },
-    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-GN_Android": {
+    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-GN_Android"
+        "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-Android"
       ]
     },
-    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan": {
+    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-Android_Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan"
+        "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-Android_Vulkan"
       ]
     },
-    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android": {
+    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android"
+        "Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android"
       ]
     },
-    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
+    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android_Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android_Vulkan"
+        "Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android_Vulkan"
       ]
     },
-    "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench": {
+    "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Skpbench": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench"
+        "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Skpbench"
       ]
     },
-    "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench": {
+    "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Vulkan_Skpbench": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench"
+        "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Vulkan_Skpbench"
       ]
     },
-    "Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug-GN": {
+    "Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug-GN"
+        "Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug"
       ]
     },
-    "Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN": {
+    "Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN"
+        "Upload-Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release"
       ]
     },
-    "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug-GN": {
+    "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug-GN"
+        "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug"
       ]
     },
-    "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN": {
+    "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN"
+        "Upload-Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release"
       ]
     },
-    "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-GN": {
+    "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-GN"
+        "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug"
       ]
     },
-    "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-CommandBuffer": {
+    "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-CommandBuffer"
+        "Upload-Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release"
       ]
     },
-    "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN": {
+    "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-CommandBuffer": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN"
+        "Upload-Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-CommandBuffer"
       ]
     },
-    "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN": {
+    "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN"
+        "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug"
       ]
     },
-    "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN": {
+    "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN"
+        "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN"
       ]
     },
     "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN": {
@@ -686,10 +674,10 @@
         "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN"
       ]
     },
-    "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN": {
+    "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN"
+        "Upload-Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release"
       ]
     },
     "Perf-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN": {
@@ -704,10 +692,10 @@
         "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug"
       ]
     },
-    "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN": {
+    "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN"
+        "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug"
       ]
     },
     "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
@@ -716,16 +704,16 @@
         "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
       ]
     },
-    "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs": {
+    "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs"
+        "Upload-Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release"
       ]
     },
-    "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": {
+    "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN"
+        "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs"
       ]
     },
     "Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs": {
@@ -740,16 +728,16 @@
         "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind"
       ]
     },
-    "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug-GN": {
+    "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug-GN"
+        "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug"
       ]
     },
-    "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN": {
+    "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN"
+        "Upload-Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release"
       ]
     },
     "Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
@@ -890,274 +878,274 @@
         "Upload-Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release"
       ]
     },
-    "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android": {
+    "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android"
+        "Upload-Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android"
       ]
     },
-    "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android": {
+    "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android"
+        "Upload-Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android"
       ]
     },
-    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android": {
+    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android"
+        "Upload-Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android"
       ]
     },
-    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android": {
+    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android"
+        "Upload-Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android"
       ]
     },
-    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android": {
+    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android"
+        "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android"
       ]
     },
-    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan": {
+    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android_Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan"
+        "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android_Vulkan"
       ]
     },
-    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android": {
+    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android"
+        "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android"
       ]
     },
-    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
+    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan"
+        "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan"
       ]
     },
-    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android": {
+    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android"
+        "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android"
       ]
     },
-    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan": {
+    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan"
+        "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan"
       ]
     },
-    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android": {
+    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android"
+        "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android"
       ]
     },
-    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan": {
+    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan"
+        "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan"
       ]
     },
-    "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android": {
+    "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android"
+        "Upload-Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-Android"
       ]
     },
-    "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android": {
+    "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android"
+        "Upload-Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android"
       ]
     },
-    "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android": {
+    "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android"
+        "Upload-Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android"
       ]
     },
-    "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android": {
+    "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android"
+        "Upload-Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android"
       ]
     },
-    "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android": {
+    "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android"
+        "Upload-Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-Android"
       ]
     },
-    "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android": {
+    "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android"
+        "Upload-Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android"
       ]
     },
-    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android": {
+    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android"
+        "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android"
       ]
     },
-    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan": {
+    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan"
+        "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan"
       ]
     },
-    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android": {
+    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android"
+        "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android"
       ]
     },
-    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan": {
+    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan"
+        "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan"
       ]
     },
-    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android": {
+    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android"
+        "Upload-Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android"
       ]
     },
-    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android": {
+    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android"
+        "Upload-Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android"
       ]
     },
-    "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android": {
+    "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android"
+        "Upload-Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-Android"
       ]
     },
-    "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android": {
+    "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android"
+        "Upload-Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android"
       ]
     },
-    "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android": {
+    "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android"
+        "Upload-Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android"
       ]
     },
-    "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android": {
+    "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android"
+        "Upload-Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android"
       ]
     },
-    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android": {
+    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android"
+        "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android"
       ]
     },
-    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan": {
+    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan"
+        "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan"
       ]
     },
-    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android": {
+    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android"
+        "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android"
       ]
     },
-    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan": {
+    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan"
+        "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan"
       ]
     },
-    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android": {
+    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android"
+        "Upload-Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android"
       ]
     },
-    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan": {
+    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android_Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan"
+        "Upload-Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android_Vulkan"
       ]
     },
-    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android": {
+    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android"
+        "Upload-Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android"
       ]
     },
-    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
+    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android_Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android_Vulkan"
+        "Upload-Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android_Vulkan"
       ]
     },
-    "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug-GN": {
+    "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug-GN"
+        "Upload-Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug"
       ]
     },
-    "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN": {
+    "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN"
+        "Upload-Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release"
       ]
     },
-    "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug-GN": {
+    "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug-GN"
+        "Upload-Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug"
       ]
     },
-    "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN": {
+    "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN"
+        "Upload-Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release"
       ]
     },
-    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer": {
+    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer"
+        "Upload-Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug"
       ]
     },
-    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-GN": {
+    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-GN"
+        "Upload-Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer"
       ]
     },
-    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN": {
+    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN"
+        "Upload-Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release"
       ]
     },
-    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN"
+        "Upload-Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug"
       ]
     },
-    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN"
+        "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN"
       ]
     },
     "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN": {
@@ -1166,10 +1154,10 @@
         "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN"
       ]
     },
-    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN"
+        "Upload-Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release"
       ]
     },
     "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN": {
@@ -1196,6 +1184,12 @@
         "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug"
       ]
     },
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug"
+      ]
+    },
     "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs": {
       "priority": 0.8,
       "tasks": [
@@ -1215,28 +1209,22 @@
         "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs"
       ]
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN"
-      ]
-    },
     "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
       "priority": 0.8,
       "tasks": [
         "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
       ]
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast": {
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast"
+        "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release"
       ]
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": {
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN"
+        "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast"
       ]
     },
     "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD": {
@@ -1251,16 +1239,16 @@
         "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind"
       ]
     },
-    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug-GN": {
+    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug-GN"
+        "Upload-Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug"
       ]
     },
-    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN": {
+    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN"
+        "Upload-Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release"
       ]
     },
     "Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
@@ -1459,7 +1447,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Mac-Clang-arm64-Debug-GN_Android": {
+    "Build-Mac-Clang-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/android_ndk_darwin",
@@ -1477,7 +1465,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Mac-Clang-arm64-Debug-GN_Android",
+        "buildername=Build-Mac-Clang-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -1516,7 +1504,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Mac-Clang-x86_64-Debug-CommandBuffer": {
+    "Build-Mac-Clang-x86_64-Debug": {
       "dimensions": [
         "gpu:none",
         "os:Mac-10.11",
@@ -1527,7 +1515,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Mac-Clang-x86_64-Debug-CommandBuffer",
+        "buildername=Build-Mac-Clang-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -1541,7 +1529,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Mac-Clang-x86_64-Debug-GN": {
+    "Build-Mac-Clang-x86_64-Debug-CommandBuffer": {
       "dimensions": [
         "gpu:none",
         "os:Mac-10.11",
@@ -1552,7 +1540,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Mac-Clang-x86_64-Debug-GN",
+        "buildername=Build-Mac-Clang-x86_64-Debug-CommandBuffer",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -1566,7 +1554,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Mac-Clang-x86_64-Release-CommandBuffer": {
+    "Build-Mac-Clang-x86_64-Release": {
       "dimensions": [
         "gpu:none",
         "os:Mac-10.11",
@@ -1577,7 +1565,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Mac-Clang-x86_64-Release-CommandBuffer",
+        "buildername=Build-Mac-Clang-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -1591,7 +1579,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Mac-Clang-x86_64-Release-GN": {
+    "Build-Mac-Clang-x86_64-Release-CommandBuffer": {
       "dimensions": [
         "gpu:none",
         "os:Mac-10.11",
@@ -1602,7 +1590,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Mac-Clang-x86_64-Release-GN",
+        "buildername=Build-Mac-Clang-x86_64-Release-CommandBuffer",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -1616,7 +1604,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-Clang-arm-Debug-GN_Android": {
+    "Build-Ubuntu-Clang-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/android_ndk_linux",
@@ -1634,7 +1622,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-arm-Debug-GN_Android",
+        "buildername=Build-Ubuntu-Clang-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -1648,7 +1636,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-Clang-arm-Release-GN_Android": {
+    "Build-Ubuntu-Clang-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/android_ndk_linux",
@@ -1666,7 +1654,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-arm-Release-GN_Android",
+        "buildername=Build-Ubuntu-Clang-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -1680,7 +1668,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-Clang-arm64-Debug-GN_Android": {
+    "Build-Ubuntu-Clang-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/android_ndk_linux",
@@ -1698,7 +1686,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-arm64-Debug-GN_Android",
+        "buildername=Build-Ubuntu-Clang-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -1712,7 +1700,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs": {
+    "Build-Ubuntu-Clang-arm64-Debug-Android_FrameworkDefs": {
       "cipd_packages": [
         {
           "name": "skia/bots/android_ndk_linux",
@@ -1730,7 +1718,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs",
+        "buildername=Build-Ubuntu-Clang-arm64-Debug-Android_FrameworkDefs",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -1744,7 +1732,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan": {
+    "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/android_ndk_linux",
@@ -1762,7 +1750,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -1776,7 +1764,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-Clang-arm64-Release-GN_Android": {
+    "Build-Ubuntu-Clang-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/android_ndk_linux",
@@ -1794,7 +1782,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-arm64-Release-GN_Android",
+        "buildername=Build-Ubuntu-Clang-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -1808,7 +1796,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan": {
+    "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/android_ndk_linux",
@@ -1826,7 +1814,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan",
+        "buildername=Build-Ubuntu-Clang-arm64-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -1840,7 +1828,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-Clang-mips64el-Debug-GN_Android": {
+    "Build-Ubuntu-Clang-mips64el-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/android_ndk_linux",
@@ -1858,7 +1846,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-mips64el-Debug-GN_Android",
+        "buildername=Build-Ubuntu-Clang-mips64el-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -1872,7 +1860,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-Clang-mips64el-Release-GN_Android": {
+    "Build-Ubuntu-Clang-mips64el-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/android_ndk_linux",
@@ -1890,7 +1878,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-mips64el-Release-GN_Android",
+        "buildername=Build-Ubuntu-Clang-mips64el-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -1904,7 +1892,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-Clang-mipsel-Debug-GN_Android": {
+    "Build-Ubuntu-Clang-mipsel-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/android_ndk_linux",
@@ -1922,7 +1910,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-mipsel-Debug-GN_Android",
+        "buildername=Build-Ubuntu-Clang-mipsel-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -1936,7 +1924,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-Clang-mipsel-Release-GN_Android": {
+    "Build-Ubuntu-Clang-mipsel-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/android_ndk_linux",
@@ -1954,7 +1942,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-mipsel-Release-GN_Android",
+        "buildername=Build-Ubuntu-Clang-mipsel-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -1968,7 +1956,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-Clang-x64-Debug-GN_Android": {
+    "Build-Ubuntu-Clang-x64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/android_ndk_linux",
@@ -1986,7 +1974,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-x64-Debug-GN_Android",
+        "buildername=Build-Ubuntu-Clang-x64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -2000,7 +1988,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-Clang-x64-Release-GN_Android": {
+    "Build-Ubuntu-Clang-x64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/android_ndk_linux",
@@ -2018,7 +2006,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-x64-Release-GN_Android",
+        "buildername=Build-Ubuntu-Clang-x64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -2032,7 +2020,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-Clang-x86-Debug-GN_Android": {
+    "Build-Ubuntu-Clang-x86-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/android_ndk_linux",
@@ -2050,7 +2038,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-x86-Debug-GN_Android",
+        "buildername=Build-Ubuntu-Clang-x86-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -2064,7 +2052,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-Clang-x86-Debug-GN_Android_Vulkan": {
+    "Build-Ubuntu-Clang-x86-Debug-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/android_ndk_linux",
@@ -2082,7 +2070,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-x86-Debug-GN_Android_Vulkan",
+        "buildername=Build-Ubuntu-Clang-x86-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -2096,7 +2084,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-Clang-x86-Release-GN_Android": {
+    "Build-Ubuntu-Clang-x86-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/android_ndk_linux",
@@ -2114,7 +2102,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-x86-Release-GN_Android",
+        "buildername=Build-Ubuntu-Clang-x86-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -2128,7 +2116,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-Clang-x86-Release-GN_Android_Vulkan": {
+    "Build-Ubuntu-Clang-x86-Release-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/android_ndk_linux",
@@ -2146,7 +2134,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-x86-Release-GN_Android_Vulkan",
+        "buildername=Build-Ubuntu-Clang-x86-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -2160,7 +2148,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-Clang-x86_64-Debug-ASAN": {
+    "Build-Ubuntu-Clang-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/clang_linux",
@@ -2178,7 +2166,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-x86_64-Debug-ASAN",
+        "buildername=Build-Ubuntu-Clang-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -2192,7 +2180,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-Clang-x86_64-Debug-GN": {
+    "Build-Ubuntu-Clang-x86_64-Debug-ASAN": {
       "cipd_packages": [
         {
           "name": "skia/bots/clang_linux",
@@ -2210,7 +2198,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-x86_64-Debug-GN",
+        "buildername=Build-Ubuntu-Clang-x86_64-Debug-ASAN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -2256,7 +2244,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-Clang-x86_64-Release-GN": {
+    "Build-Ubuntu-Clang-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/clang_linux",
@@ -2274,7 +2262,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-x86_64-Release-GN",
+        "buildername=Build-Ubuntu-Clang-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -2370,7 +2358,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-GCC-x86_64-Debug-GN": {
+    "Build-Ubuntu-GCC-x86_64-Debug": {
       "dimensions": [
         "gpu:none",
         "os:Ubuntu-14.04",
@@ -2381,7 +2369,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-GCC-x86_64-Debug-GN",
+        "buildername=Build-Ubuntu-GCC-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -2445,7 +2433,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-GCC-x86_64-Release-ANGLE": {
+    "Build-Ubuntu-GCC-x86_64-Release": {
       "dimensions": [
         "gpu:none",
         "os:Ubuntu-14.04",
@@ -2456,7 +2444,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-GCC-x86_64-Release-ANGLE",
+        "buildername=Build-Ubuntu-GCC-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -2470,7 +2458,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-GCC-x86_64-Release-Fast": {
+    "Build-Ubuntu-GCC-x86_64-Release-ANGLE": {
       "dimensions": [
         "gpu:none",
         "os:Ubuntu-14.04",
@@ -2481,7 +2469,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-GCC-x86_64-Release-Fast",
+        "buildername=Build-Ubuntu-GCC-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -2495,7 +2483,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-GCC-x86_64-Release-GN": {
+    "Build-Ubuntu-GCC-x86_64-Release-Fast": {
       "dimensions": [
         "gpu:none",
         "os:Ubuntu-14.04",
@@ -2506,7 +2494,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-GCC-x86_64-Release-GN",
+        "buildername=Build-Ubuntu-GCC-x86_64-Release-Fast",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -2670,7 +2658,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Win-Clang-arm64-Release-GN_Android": {
+    "Build-Win-Clang-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/android_ndk_windows",
@@ -2688,7 +2676,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Win-Clang-arm64-Release-GN_Android",
+        "buildername=Build-Win-Clang-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -3022,38 +3010,6 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Win-MSVC-x86_64-Debug-GN": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/win_toolchain",
-          "path": "t",
-          "version": "version:5"
-        }
-      ],
-      "dimensions": [
-        "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_compile",
-        "repository=<(REPO)",
-        "buildername=Build-Win-MSVC-x86_64-Debug-GN",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "isolate": "compile_skia.isolate",
-      "priority": 0.8
-    },
     "Build-Win-MSVC-x86_64-Debug-Vulkan": {
       "cipd_packages": [
         {
@@ -3187,38 +3143,6 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Win-MSVC-x86_64-Release-GN": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/win_toolchain",
-          "path": "t",
-          "version": "version:5"
-        }
-      ],
-      "dimensions": [
-        "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_compile",
-        "repository=<(REPO)",
-        "buildername=Build-Win-MSVC-x86_64-Release-GN",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "isolate": "compile_skia.isolate",
-      "priority": 0.8
-    },
     "Build-Win-MSVC-x86_64-Release-Vulkan": {
       "cipd_packages": [
         {
@@ -3374,7 +3298,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android": {
+    "Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -3393,7 +3317,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm-Debug-Android"
       ],
       "dimensions": [
         "device_os:MOB30Q",
@@ -3408,7 +3332,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android",
+        "buildername=Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -3423,7 +3347,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android": {
+    "Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -3442,7 +3366,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm-Release-Android"
       ],
       "dimensions": [
         "device_os:MOB30Q",
@@ -3457,7 +3381,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android",
+        "buildername=Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -3472,7 +3396,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android": {
+    "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -3491,7 +3415,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm-Debug-Android"
       ],
       "dimensions": [
         "device_os:MOB30Q",
@@ -3506,7 +3430,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android",
+        "buildername=Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -3521,7 +3445,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android": {
+    "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -3540,7 +3464,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm-Release-Android"
       ],
       "dimensions": [
         "device_os:MOB30Q",
@@ -3555,7 +3479,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android",
+        "buildername=Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -3570,7 +3494,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android": {
+    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -3589,7 +3513,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
         "device_os:MMB29M",
@@ -3604,7 +3528,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android",
+        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -3619,7 +3543,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan": {
+    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -3638,7 +3562,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:MMB29M",
@@ -3653,7 +3577,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -3668,7 +3592,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android": {
+    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -3687,7 +3611,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
         "device_os:MMB29M",
@@ -3702,7 +3626,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android",
+        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -3717,7 +3641,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
+    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -3736,7 +3660,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:MMB29M",
@@ -3751,7 +3675,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
+        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -3766,7 +3690,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android": {
+    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -3785,7 +3709,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
         "device_os:MRA58K",
@@ -3800,7 +3724,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android",
+        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -3815,7 +3739,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan": {
+    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -3834,7 +3758,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:MRA58K",
@@ -3849,7 +3773,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -3864,7 +3788,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android": {
+    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -3883,7 +3807,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
         "device_os:MRA58K",
@@ -3898,7 +3822,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android",
+        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -3913,7 +3837,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan": {
+    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -3932,7 +3856,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:MRA58K",
@@ -3947,7 +3871,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan",
+        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -3962,7 +3886,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android": {
+    "Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -3981,7 +3905,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm-Debug-Android"
       ],
       "dimensions": [
         "device_os:LMY49J",
@@ -3996,7 +3920,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android",
+        "buildername=Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4011,7 +3935,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android": {
+    "Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4030,7 +3954,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm-Release-Android"
       ],
       "dimensions": [
         "device_os:LMY49J",
@@ -4045,7 +3969,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android",
+        "buildername=Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4060,7 +3984,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android": {
+    "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4079,7 +4003,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm-Debug-Android"
       ],
       "dimensions": [
         "device_os:MOB31E",
@@ -4094,7 +4018,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android",
+        "buildername=Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4109,7 +4033,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android": {
+    "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4128,7 +4052,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm-Release-Android"
       ],
       "dimensions": [
         "device_os:MOB31E",
@@ -4143,7 +4067,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android",
+        "buildername=Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4158,7 +4082,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android": {
+    "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4177,7 +4101,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
         "device_os:NMF26C",
@@ -4192,7 +4116,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android",
+        "buildername=Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4207,7 +4131,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android": {
+    "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4226,7 +4150,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
         "device_os:NMF26C",
@@ -4241,7 +4165,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android",
+        "buildername=Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4256,7 +4180,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android": {
+    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4275,7 +4199,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
         "device_os:NMF26C",
@@ -4290,7 +4214,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android",
+        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4305,7 +4229,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan": {
+    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4324,7 +4248,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:NMF26C",
@@ -4339,7 +4263,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4354,7 +4278,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android": {
+    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4373,7 +4297,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
         "device_os:NMF26C",
@@ -4388,7 +4312,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android",
+        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4403,7 +4327,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan": {
+    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4422,7 +4346,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:NMF26C",
@@ -4437,7 +4361,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan",
+        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4452,7 +4376,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android": {
+    "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4471,7 +4395,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm-Debug-Android"
       ],
       "dimensions": [
         "device_os:LMY47V",
@@ -4486,7 +4410,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android",
+        "buildername=Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4501,7 +4425,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android": {
+    "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4520,7 +4444,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm-Release-Android"
       ],
       "dimensions": [
         "device_os:LMY47V",
@@ -4535,7 +4459,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android",
+        "buildername=Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4550,7 +4474,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android": {
+    "Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4569,7 +4493,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
         "device_os:NRD91D",
@@ -4584,7 +4508,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android",
+        "buildername=Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4599,7 +4523,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android": {
+    "Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4618,7 +4542,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
         "device_os:NRD91D",
@@ -4633,7 +4557,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android",
+        "buildername=Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4648,7 +4572,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android": {
+    "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4667,7 +4591,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Debug-GN_Android"
+        "Build-Ubuntu-Clang-x86-Debug-Android"
       ],
       "dimensions": [
         "device_os:NRD90R",
@@ -4682,7 +4606,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android",
+        "buildername=Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4697,7 +4621,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android": {
+    "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4716,7 +4640,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Release-GN_Android"
+        "Build-Ubuntu-Clang-x86-Release-Android"
       ],
       "dimensions": [
         "device_os:NRD90R",
@@ -4731,7 +4655,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android",
+        "buildername=Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4746,7 +4670,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android": {
+    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4765,7 +4689,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Debug-GN_Android"
+        "Build-Ubuntu-Clang-x86-Debug-Android"
       ],
       "dimensions": [
         "device_os:NRD90R",
@@ -4780,7 +4704,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android",
+        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4795,7 +4719,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan": {
+    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4814,7 +4738,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Debug-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-x86-Debug-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:NRD90R",
@@ -4829,7 +4753,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan",
+        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4844,7 +4768,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android": {
+    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4863,7 +4787,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Release-GN_Android"
+        "Build-Ubuntu-Clang-x86-Release-Android"
       ],
       "dimensions": [
         "device_os:NRD90R",
@@ -4878,7 +4802,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android",
+        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4893,7 +4817,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan": {
+    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4912,7 +4836,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Release-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-x86-Release-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:NRD90R",
@@ -4927,7 +4851,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan",
+        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4942,7 +4866,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-GN_Android": {
+    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4961,7 +4885,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
         "device_os:NMF25",
@@ -4976,7 +4900,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-GN_Android",
+        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4991,7 +4915,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan": {
+    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -5010,7 +4934,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:NMF25",
@@ -5025,7 +4949,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -5040,7 +4964,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android": {
+    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -5059,7 +4983,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
         "device_os:NMF25",
@@ -5074,7 +4998,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android",
+        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -5089,7 +5013,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
+    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -5108,7 +5032,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:NMF25",
@@ -5123,7 +5047,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
+        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -5138,7 +5062,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench": {
+    "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Skpbench": {
       "cipd_packages": [
         {
           "name": "skia/bots/skp",
@@ -5147,7 +5071,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
         "device_os:NMF26C",
@@ -5162,7 +5086,7 @@
         "../../..",
         "swarm_skpbench",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench",
+        "buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Skpbench",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -5177,7 +5101,7 @@
       "isolate": "skpbench_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench": {
+    "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Vulkan_Skpbench": {
       "cipd_packages": [
         {
           "name": "skia/bots/skp",
@@ -5186,7 +5110,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:NMF26C",
@@ -5201,7 +5125,7 @@
         "../../..",
         "swarm_skpbench",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench",
+        "buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Vulkan_Skpbench",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -5216,7 +5140,7 @@
       "isolate": "skpbench_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug-GN": {
+    "Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -5235,7 +5159,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug-GN"
+        "Build-Mac-Clang-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:10de:08a4",
@@ -5249,7 +5173,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug-GN",
+        "buildername=Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -5264,7 +5188,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN": {
+    "Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -5283,7 +5207,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release-GN"
+        "Build-Mac-Clang-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:08a4",
@@ -5297,7 +5221,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN",
+        "buildername=Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -5312,7 +5236,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug-GN": {
+    "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -5331,7 +5255,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug-GN"
+        "Build-Mac-Clang-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64",
@@ -5346,7 +5270,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug-GN",
+        "buildername=Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -5361,7 +5285,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN": {
+    "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -5380,7 +5304,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release-GN"
+        "Build-Mac-Clang-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64",
@@ -5395,7 +5319,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN",
+        "buildername=Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -5410,7 +5334,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-GN": {
+    "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -5429,7 +5353,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug-GN"
+        "Build-Mac-Clang-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:8086:0a2e",
@@ -5443,7 +5367,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-GN",
+        "buildername=Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -5458,7 +5382,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-CommandBuffer": {
+    "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -5477,7 +5401,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release-CommandBuffer"
+        "Build-Mac-Clang-x86_64-Release"
       ],
       "dimensions": [
         "gpu:8086:0a2e",
@@ -5491,7 +5415,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-CommandBuffer",
+        "buildername=Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -5506,7 +5430,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN": {
+    "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-CommandBuffer": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -5525,7 +5449,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release-GN"
+        "Build-Mac-Clang-x86_64-Release-CommandBuffer"
       ],
       "dimensions": [
         "gpu:8086:0a2e",
@@ -5539,7 +5463,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN",
+        "buildername=Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-CommandBuffer",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -5554,7 +5478,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN": {
+    "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -5570,15 +5494,10 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:3"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:4"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug-ASAN"
+        "Build-Ubuntu-Clang-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -5593,7 +5512,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN",
+        "buildername=Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -5608,7 +5527,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN": {
+    "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -5624,10 +5543,15 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:3"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:4"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug-GN"
+        "Build-Ubuntu-Clang-x86_64-Debug-ASAN"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -5642,7 +5566,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN",
+        "buildername=Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -5711,7 +5635,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN": {
+    "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -5730,7 +5654,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-GN"
+        "Build-Ubuntu-Clang-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -5745,7 +5669,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN",
+        "buildername=Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -5862,7 +5786,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN": {
+    "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -5881,7 +5805,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Debug-GN"
+        "Build-Ubuntu-GCC-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -5896,7 +5820,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN",
+        "buildername=Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -5960,32 +5884,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs": {
-      "dimensions": [
-        "pool:SkiaCT"
-      ],
-      "execution_timeout_ns": 86400000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_ct_skps",
-        "repository=<(REPO)",
-        "buildername=Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 3600000000000,
-      "isolate": "ct_skps_skia.isolate",
-      "priority": 0.8
-    },
-    "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": {
+    "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -6004,7 +5903,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release-GN"
+        "Build-Ubuntu-GCC-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -6019,7 +5918,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN",
+        "buildername=Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -6034,6 +5933,31 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
+    "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs": {
+      "dimensions": [
+        "pool:SkiaCT"
+      ],
+      "execution_timeout_ns": 86400000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_ct_skps",
+        "repository=<(REPO)",
+        "buildername=Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 3600000000000,
+      "isolate": "ct_skps_skia.isolate",
+      "priority": 0.8
+    },
     "Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs": {
       "dimensions": [
         "pool:SkiaCT"
@@ -6107,7 +6031,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug-GN": {
+    "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -6126,7 +6050,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Debug-GN"
+        "Build-Ubuntu-GCC-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:10de:11c0",
@@ -6140,7 +6064,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug-GN",
+        "buildername=Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -6155,7 +6079,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN": {
+    "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -6174,7 +6098,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release-GN"
+        "Build-Ubuntu-GCC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:11c0",
@@ -6188,7 +6112,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN",
+        "buildername=Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -7311,7 +7235,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android": {
+    "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7330,7 +7254,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm-Debug-Android"
       ],
       "dimensions": [
         "device_os:MOB30Q",
@@ -7345,7 +7269,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android",
+        "buildername=Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -7360,7 +7284,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android": {
+    "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7379,7 +7303,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm-Release-Android"
       ],
       "dimensions": [
         "device_os:MOB30Q",
@@ -7394,7 +7318,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android",
+        "buildername=Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -7409,7 +7333,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android": {
+    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7428,7 +7352,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm-Debug-Android"
       ],
       "dimensions": [
         "device_os:MOB30Q",
@@ -7443,7 +7367,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android",
+        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -7458,7 +7382,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android": {
+    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7477,7 +7401,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm-Release-Android"
       ],
       "dimensions": [
         "device_os:MOB30Q",
@@ -7492,7 +7416,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android",
+        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -7507,7 +7431,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android": {
+    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7526,7 +7450,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
         "device_os:MMB29M",
@@ -7541,7 +7465,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android",
+        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -7556,7 +7480,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan": {
+    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7575,7 +7499,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:MMB29M",
@@ -7590,7 +7514,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -7605,7 +7529,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android": {
+    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7624,7 +7548,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
         "device_os:MMB29M",
@@ -7639,7 +7563,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android",
+        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -7654,7 +7578,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
+    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7673,7 +7597,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:MMB29M",
@@ -7688,7 +7612,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -7703,7 +7627,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android": {
+    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7722,7 +7646,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
         "device_os:MRA58K",
@@ -7737,7 +7661,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -7752,7 +7676,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan": {
+    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7771,7 +7695,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:MRA58K",
@@ -7786,7 +7710,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -7801,7 +7725,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android": {
+    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7820,7 +7744,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
         "device_os:MRA58K",
@@ -7835,7 +7759,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -7850,7 +7774,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan": {
+    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7869,7 +7793,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:MRA58K",
@@ -7884,7 +7808,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -7899,7 +7823,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android": {
+    "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7918,7 +7842,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm-Debug-Android"
       ],
       "dimensions": [
         "device_os:LMY49J",
@@ -7933,7 +7857,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android",
+        "buildername=Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -7948,7 +7872,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android": {
+    "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -7967,7 +7891,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm-Release-Android"
       ],
       "dimensions": [
         "device_os:LMY49J",
@@ -7982,7 +7906,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android",
+        "buildername=Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -7997,7 +7921,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android": {
+    "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8016,7 +7940,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm-Debug-Android"
       ],
       "dimensions": [
         "device_os:MOB31E",
@@ -8031,7 +7955,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android",
+        "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8046,7 +7970,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android": {
+    "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8065,7 +7989,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm-Release-Android"
       ],
       "dimensions": [
         "device_os:MOB31E",
@@ -8080,7 +8004,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android",
+        "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8095,7 +8019,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android": {
+    "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8114,7 +8038,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
         "device_os:NMF26C",
@@ -8129,7 +8053,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android",
+        "buildername=Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8144,7 +8068,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android": {
+    "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8163,7 +8087,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
         "device_os:NMF26C",
@@ -8178,7 +8102,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android",
+        "buildername=Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8193,7 +8117,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android": {
+    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8212,7 +8136,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
         "device_os:NMF26C",
@@ -8227,7 +8151,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8242,7 +8166,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan": {
+    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8261,7 +8185,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:NMF26C",
@@ -8276,7 +8200,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8291,7 +8215,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android": {
+    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8310,7 +8234,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
         "device_os:NMF26C",
@@ -8325,7 +8249,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8340,7 +8264,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan": {
+    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8359,7 +8283,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:NMF26C",
@@ -8374,7 +8298,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8389,7 +8313,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android": {
+    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8408,7 +8332,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm-Debug-Android"
       ],
       "dimensions": [
         "device_os:LMY47V",
@@ -8423,7 +8347,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android",
+        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8438,7 +8362,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android": {
+    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8457,7 +8381,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm-Release-Android"
       ],
       "dimensions": [
         "device_os:LMY47V",
@@ -8472,7 +8396,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android",
+        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8487,7 +8411,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android": {
+    "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8506,7 +8430,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
         "device_os:NRD91D",
@@ -8521,7 +8445,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android",
+        "buildername=Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8536,7 +8460,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android": {
+    "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8555,7 +8479,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
         "device_os:NRD91D",
@@ -8570,7 +8494,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android",
+        "buildername=Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8585,7 +8509,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android": {
+    "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8604,7 +8528,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Debug-GN_Android"
+        "Build-Ubuntu-Clang-x86-Debug-Android"
       ],
       "dimensions": [
         "device_os:NRD90R",
@@ -8619,7 +8543,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android",
+        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8634,7 +8558,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android": {
+    "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8653,7 +8577,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Release-GN_Android"
+        "Build-Ubuntu-Clang-x86-Release-Android"
       ],
       "dimensions": [
         "device_os:NRD90R",
@@ -8668,7 +8592,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android",
+        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8683,7 +8607,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android": {
+    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8702,7 +8626,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Debug-GN_Android"
+        "Build-Ubuntu-Clang-x86-Debug-Android"
       ],
       "dimensions": [
         "device_os:NRD90R",
@@ -8717,7 +8641,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8732,7 +8656,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan": {
+    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8751,7 +8675,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Debug-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-x86-Debug-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:NRD90R",
@@ -8766,7 +8690,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8781,7 +8705,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android": {
+    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8800,7 +8724,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Release-GN_Android"
+        "Build-Ubuntu-Clang-x86-Release-Android"
       ],
       "dimensions": [
         "device_os:NRD90R",
@@ -8815,7 +8739,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8830,7 +8754,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan": {
+    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8849,7 +8773,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Release-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-x86-Release-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:NRD90R",
@@ -8864,7 +8788,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8879,7 +8803,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android": {
+    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8898,7 +8822,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
         "device_os:NMF25",
@@ -8913,7 +8837,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android",
+        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8928,7 +8852,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan": {
+    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8947,7 +8871,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:NMF25",
@@ -8962,7 +8886,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8977,7 +8901,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android": {
+    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8996,7 +8920,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
         "device_os:NMF25",
@@ -9011,7 +8935,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android",
+        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -9026,7 +8950,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
+    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -9045,7 +8969,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:NMF25",
@@ -9060,7 +8984,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -9075,7 +8999,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug-GN": {
+    "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -9094,7 +9018,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug-GN"
+        "Build-Mac-Clang-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:10de:08a4",
@@ -9108,7 +9032,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug-GN",
+        "buildername=Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -9123,7 +9047,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN": {
+    "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -9142,7 +9066,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release-GN"
+        "Build-Mac-Clang-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:08a4",
@@ -9156,7 +9080,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN",
+        "buildername=Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -9171,7 +9095,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug-GN": {
+    "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -9190,7 +9114,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug-GN"
+        "Build-Mac-Clang-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64",
@@ -9205,7 +9129,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug-GN",
+        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -9220,7 +9144,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN": {
+    "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -9239,7 +9163,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release-GN"
+        "Build-Mac-Clang-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64",
@@ -9254,7 +9178,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN",
+        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -9269,7 +9193,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer": {
+    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -9288,7 +9212,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug-CommandBuffer"
+        "Build-Mac-Clang-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:8086:0a2e",
@@ -9302,7 +9226,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer",
+        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -9317,7 +9241,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-GN": {
+    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -9336,7 +9260,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug-GN"
+        "Build-Mac-Clang-x86_64-Debug-CommandBuffer"
       ],
       "dimensions": [
         "gpu:8086:0a2e",
@@ -9350,7 +9274,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-GN",
+        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -9365,7 +9289,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN": {
+    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -9384,7 +9308,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release-GN"
+        "Build-Mac-Clang-x86_64-Release"
       ],
       "dimensions": [
         "gpu:8086:0a2e",
@@ -9398,7 +9322,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN",
+        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -9413,7 +9337,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -9429,15 +9353,10 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:3"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:4"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug-ASAN"
+        "Build-Ubuntu-Clang-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -9452,7 +9371,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -9467,7 +9386,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -9483,10 +9402,15 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:3"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:4"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug-GN"
+        "Build-Ubuntu-Clang-x86_64-Debug-ASAN"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -9501,7 +9425,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -9570,7 +9494,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -9589,7 +9513,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-GN"
+        "Build-Ubuntu-Clang-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -9604,7 +9528,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -9828,17 +9752,41 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs": {
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:16"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-GCC-x86_64-Debug"
+      ],
       "dimensions": [
-        "pool:SkiaCT"
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
       ],
-      "execution_timeout_ns": 86400000000000,
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
-        "swarm_ct_skps",
+        "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -9849,11 +9797,11 @@
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "io_timeout_ns": 3600000000000,
-      "isolate": "ct_skps_skia.isolate",
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs": {
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs": {
       "dimensions": [
         "pool:SkiaCT"
       ],
@@ -9863,7 +9811,7 @@
         "../../..",
         "swarm_ct_skps",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -9878,7 +9826,7 @@
       "isolate": "ct_skps_skia.isolate",
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs": {
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs": {
       "dimensions": [
         "pool:SkiaCT"
       ],
@@ -9888,7 +9836,7 @@
         "../../..",
         "swarm_ct_skps",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -9903,41 +9851,17 @@
       "isolate": "ct_skps_skia.isolate",
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:16"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:22"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Debug-GN"
-      ],
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs": {
       "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu-14.04",
-        "pool:Skia"
+        "pool:SkiaCT"
       ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
+      "execution_timeout_ns": 86400000000000,
       "extra_args": [
         "--workdir",
         "../../..",
-        "swarm_test",
+        "swarm_ct_skps",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -9948,8 +9872,8 @@
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia.isolate",
+      "io_timeout_ns": 3600000000000,
+      "isolate": "ct_skps_skia.isolate",
       "priority": 0.8
     },
     "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
@@ -10001,7 +9925,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast": {
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10020,7 +9944,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release-Fast"
+        "Build-Ubuntu-GCC-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -10035,7 +9959,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -10050,7 +9974,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": {
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10069,7 +9993,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release-GN"
+        "Build-Ubuntu-GCC-x86_64-Release-Fast"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -10084,7 +10008,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -10196,7 +10120,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug-GN": {
+    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10215,7 +10139,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Debug-GN"
+        "Build-Ubuntu-GCC-x86_64-Debug"
       ],
       "dimensions": [
         "gpu:10de:11c0",
@@ -10229,7 +10153,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug-GN",
+        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -10244,7 +10168,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN": {
+    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10263,7 +10187,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release-GN"
+        "Build-Ubuntu-GCC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:11c0",
@@ -10277,7 +10201,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN",
+        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -11450,9 +11374,9 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android": {
+    "Upload-Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android": {
       "dependencies": [
-        "Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android"
+        "Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -11465,7 +11389,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android",
+        "buildername=Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -11479,9 +11403,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android": {
+    "Upload-Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android": {
       "dependencies": [
-        "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android"
+        "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -11494,7 +11418,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android",
+        "buildername=Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -11508,9 +11432,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android": {
+    "Upload-Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android": {
       "dependencies": [
-        "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android"
+        "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -11523,7 +11447,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android",
+        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -11537,9 +11461,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
+    "Upload-Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan": {
       "dependencies": [
-        "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan"
+        "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -11552,7 +11476,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
+        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -11566,9 +11490,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android": {
+    "Upload-Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android": {
       "dependencies": [
-        "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android"
+        "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -11581,7 +11505,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android",
+        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -11595,9 +11519,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan": {
+    "Upload-Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan": {
       "dependencies": [
-        "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan"
+        "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -11610,7 +11534,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan",
+        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -11624,9 +11548,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android": {
+    "Upload-Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android": {
       "dependencies": [
-        "Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android"
+        "Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -11639,7 +11563,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android",
+        "buildername=Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -11653,9 +11577,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android": {
+    "Upload-Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android": {
       "dependencies": [
-        "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android"
+        "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -11668,7 +11592,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android",
+        "buildername=Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -11682,9 +11606,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android": {
+    "Upload-Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android": {
       "dependencies": [
-        "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android"
+        "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -11697,7 +11621,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android",
+        "buildername=Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -11711,9 +11635,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android": {
+    "Upload-Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android": {
       "dependencies": [
-        "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android"
+        "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -11726,7 +11650,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android",
+        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -11740,9 +11664,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan": {
+    "Upload-Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan": {
       "dependencies": [
-        "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan"
+        "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -11755,7 +11679,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan",
+        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -11769,9 +11693,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android": {
+    "Upload-Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android": {
       "dependencies": [
-        "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android"
+        "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -11784,7 +11708,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android",
+        "buildername=Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -11798,9 +11722,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android": {
+    "Upload-Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android": {
       "dependencies": [
-        "Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android"
+        "Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -11813,7 +11737,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android",
+        "buildername=Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -11827,9 +11751,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android": {
+    "Upload-Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android": {
       "dependencies": [
-        "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android"
+        "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -11842,7 +11766,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android",
+        "buildername=Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -11856,9 +11780,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android": {
+    "Upload-Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android": {
       "dependencies": [
-        "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android"
+        "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -11871,7 +11795,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android",
+        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -11885,9 +11809,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan": {
+    "Upload-Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan": {
       "dependencies": [
-        "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan"
+        "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -11900,7 +11824,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan",
+        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -11914,9 +11838,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android": {
+    "Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android": {
       "dependencies": [
-        "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android"
+        "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -11929,7 +11853,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android",
+        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -11943,9 +11867,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
+    "Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android_Vulkan": {
       "dependencies": [
-        "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android_Vulkan"
+        "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -11958,7 +11882,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
+        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -11972,9 +11896,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench": {
+    "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Skpbench": {
       "dependencies": [
-        "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench"
+        "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Skpbench"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -11987,7 +11911,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench",
+        "buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Skpbench",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12001,9 +11925,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench": {
+    "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Vulkan_Skpbench": {
       "dependencies": [
-        "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench"
+        "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Vulkan_Skpbench"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12016,7 +11940,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench",
+        "buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Vulkan_Skpbench",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12030,9 +11954,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN": {
+    "Upload-Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release": {
       "dependencies": [
-        "Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN"
+        "Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12045,7 +11969,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN",
+        "buildername=Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12059,9 +11983,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN": {
+    "Upload-Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release": {
       "dependencies": [
-        "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN"
+        "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12074,7 +11998,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN",
+        "buildername=Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12088,9 +12012,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-CommandBuffer": {
+    "Upload-Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release": {
       "dependencies": [
-        "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-CommandBuffer"
+        "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12103,7 +12027,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-CommandBuffer",
+        "buildername=Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12117,9 +12041,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN": {
+    "Upload-Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-CommandBuffer": {
       "dependencies": [
-        "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN"
+        "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-CommandBuffer"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12132,7 +12056,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN",
+        "buildername=Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-CommandBuffer",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12146,9 +12070,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN": {
+    "Upload-Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release": {
       "dependencies": [
-        "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN"
+        "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12161,7 +12085,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN",
+        "buildername=Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12175,9 +12099,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": {
+    "Upload-Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release": {
       "dependencies": [
-        "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN"
+        "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12190,7 +12114,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN",
+        "buildername=Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12204,9 +12128,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN": {
+    "Upload-Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release": {
       "dependencies": [
-        "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN"
+        "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12219,7 +12143,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN",
+        "buildername=Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12552,9 +12476,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android": {
+    "Upload-Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android": {
       "dependencies": [
-        "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android"
+        "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12567,7 +12491,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android",
+        "buildername=Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12581,9 +12505,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android": {
+    "Upload-Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android": {
       "dependencies": [
-        "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android"
+        "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12596,7 +12520,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android",
+        "buildername=Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12610,9 +12534,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android": {
+    "Upload-Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android": {
       "dependencies": [
-        "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android"
+        "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12625,7 +12549,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android",
+        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12639,9 +12563,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android": {
+    "Upload-Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android": {
       "dependencies": [
-        "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android"
+        "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12654,7 +12578,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android",
+        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12668,9 +12592,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android": {
+    "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android": {
       "dependencies": [
-        "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android"
+        "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12683,7 +12607,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android",
+        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12697,9 +12621,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan": {
+    "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android_Vulkan": {
       "dependencies": [
-        "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan"
+        "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12712,7 +12636,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12726,9 +12650,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android": {
+    "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android": {
       "dependencies": [
-        "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android"
+        "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12741,7 +12665,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android",
+        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12755,9 +12679,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
+    "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan": {
       "dependencies": [
-        "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan"
+        "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12770,7 +12694,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12784,9 +12708,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android": {
+    "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android": {
       "dependencies": [
-        "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android"
+        "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12799,7 +12723,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12813,9 +12737,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan": {
+    "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan": {
       "dependencies": [
-        "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan"
+        "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12828,7 +12752,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12842,9 +12766,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android": {
+    "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android": {
       "dependencies": [
-        "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android"
+        "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12857,7 +12781,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12871,9 +12795,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan": {
+    "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan": {
       "dependencies": [
-        "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan"
+        "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12886,7 +12810,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12900,9 +12824,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android": {
+    "Upload-Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-Android": {
       "dependencies": [
-        "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android"
+        "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12915,7 +12839,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android",
+        "buildername=Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12929,9 +12853,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android": {
+    "Upload-Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android": {
       "dependencies": [
-        "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android"
+        "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12944,7 +12868,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android",
+        "buildername=Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12958,9 +12882,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android": {
+    "Upload-Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android": {
       "dependencies": [
-        "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android"
+        "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12973,7 +12897,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android",
+        "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12987,9 +12911,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android": {
+    "Upload-Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android": {
       "dependencies": [
-        "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android"
+        "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13002,7 +12926,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android",
+        "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13016,9 +12940,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android": {
+    "Upload-Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-Android": {
       "dependencies": [
-        "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android"
+        "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13031,7 +12955,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android",
+        "buildername=Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13045,9 +12969,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android": {
+    "Upload-Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android": {
       "dependencies": [
-        "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android"
+        "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13060,7 +12984,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android",
+        "buildername=Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13074,9 +12998,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android": {
+    "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android": {
       "dependencies": [
-        "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android"
+        "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13089,7 +13013,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13103,9 +13027,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan": {
+    "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan": {
       "dependencies": [
-        "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan"
+        "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13118,7 +13042,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13132,9 +13056,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android": {
+    "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android": {
       "dependencies": [
-        "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android"
+        "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13147,7 +13071,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13161,9 +13085,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan": {
+    "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan": {
       "dependencies": [
-        "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan"
+        "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13176,7 +13100,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13190,9 +13114,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android": {
+    "Upload-Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android": {
       "dependencies": [
-        "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android"
+        "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13205,7 +13129,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android",
+        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13219,9 +13143,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android": {
+    "Upload-Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android": {
       "dependencies": [
-        "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android"
+        "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13234,7 +13158,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android",
+        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13248,9 +13172,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android": {
+    "Upload-Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-Android": {
       "dependencies": [
-        "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android"
+        "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13263,7 +13187,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android",
+        "buildername=Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13277,9 +13201,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android": {
+    "Upload-Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android": {
       "dependencies": [
-        "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android"
+        "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13292,7 +13216,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android",
+        "buildername=Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13306,9 +13230,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android": {
+    "Upload-Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android": {
       "dependencies": [
-        "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android"
+        "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13321,7 +13245,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android",
+        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13335,9 +13259,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android": {
+    "Upload-Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android": {
       "dependencies": [
-        "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android"
+        "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13350,7 +13274,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android",
+        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13364,9 +13288,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android": {
+    "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android": {
       "dependencies": [
-        "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android"
+        "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13379,7 +13303,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13393,9 +13317,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan": {
+    "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan": {
       "dependencies": [
-        "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan"
+        "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13408,7 +13332,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13422,9 +13346,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android": {
+    "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android": {
       "dependencies": [
-        "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android"
+        "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13437,7 +13361,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13451,9 +13375,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan": {
+    "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan": {
       "dependencies": [
-        "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan"
+        "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13466,7 +13390,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13480,9 +13404,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android": {
+    "Upload-Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android": {
       "dependencies": [
-        "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android"
+        "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13495,7 +13419,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android",
+        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13509,9 +13433,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan": {
+    "Upload-Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android_Vulkan": {
       "dependencies": [
-        "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan"
+        "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13524,7 +13448,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13538,9 +13462,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android": {
+    "Upload-Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android": {
       "dependencies": [
-        "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android"
+        "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13553,7 +13477,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android",
+        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13567,9 +13491,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
+    "Upload-Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android_Vulkan": {
       "dependencies": [
-        "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android_Vulkan"
+        "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13582,7 +13506,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13596,9 +13520,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug-GN": {
+    "Upload-Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug": {
       "dependencies": [
-        "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug-GN"
+        "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13611,7 +13535,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug-GN",
+        "buildername=Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13625,9 +13549,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN": {
+    "Upload-Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release": {
       "dependencies": [
-        "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN"
+        "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13640,7 +13564,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN",
+        "buildername=Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13654,9 +13578,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug-GN": {
+    "Upload-Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug": {
       "dependencies": [
-        "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug-GN"
+        "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13669,7 +13593,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug-GN",
+        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13683,9 +13607,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN": {
+    "Upload-Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release": {
       "dependencies": [
-        "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN"
+        "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13698,7 +13622,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN",
+        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13712,9 +13636,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer": {
+    "Upload-Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug": {
       "dependencies": [
-        "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer"
+        "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13727,7 +13651,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer",
+        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13741,9 +13665,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-GN": {
+    "Upload-Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer": {
       "dependencies": [
-        "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-GN"
+        "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13756,7 +13680,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-GN",
+        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13770,9 +13694,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN": {
+    "Upload-Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release": {
       "dependencies": [
-        "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN"
+        "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13785,7 +13709,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN",
+        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13799,9 +13723,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN": {
+    "Upload-Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug": {
       "dependencies": [
-        "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN"
+        "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13814,7 +13738,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13828,9 +13752,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN": {
+    "Upload-Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release": {
       "dependencies": [
-        "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN"
+        "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13843,7 +13767,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13886,9 +13810,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN": {
+    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug": {
       "dependencies": [
-        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN"
+        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13901,7 +13825,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13944,9 +13868,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast": {
+    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release": {
       "dependencies": [
-        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast"
+        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13959,7 +13883,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13973,9 +13897,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": {
+    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast": {
       "dependencies": [
-        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN"
+        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13988,7 +13912,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14031,9 +13955,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug-GN": {
+    "Upload-Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug": {
       "dependencies": [
-        "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug-GN"
+        "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14046,7 +13970,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug-GN",
+        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14060,9 +13984,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN": {
+    "Upload-Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release": {
       "dependencies": [
-        "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN"
+        "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14075,7 +13999,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN",
+        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",

diff --git a/infra/branch-config/cq.cfg b/infra/branch-config/cq.cfg
index ce745e6..cfd0fb9 100644 (file)
--- a/infra/branch-config/cq.cfg
+++ b/infra/branch-config/cq.cfg
@@ -35,20 +35,20 @@ verifiers {
     }
     buckets {
       name: "skia.primary"
-      builders { name: "Build-Mac-Clang-x86_64-Release-GN" }
+      builders { name: "Build-Mac-Clang-x86_64-Release" }
       builders { name: "Build-Win-MSVC-x86-Debug" }
       builders { name: "Build-Win-MSVC-x86_64-Release-Vulkan" }
-      builders { name: "Build-Ubuntu-Clang-arm-Debug-GN_Android" }
-      builders { name: "Build-Ubuntu-Clang-arm64-Debug-GN_Android" }
-      builders { name: "Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs" }
-      builders { name: "Build-Ubuntu-Clang-mips64el-Debug-GN_Android" }
-      builders { name: "Build-Ubuntu-Clang-x86_64-Debug-GN" }
-      builders { name: "Build-Ubuntu-GCC-x86_64-Release-GN" }
+      builders { name: "Build-Ubuntu-Clang-arm-Debug-Android" }
+      builders { name: "Build-Ubuntu-Clang-arm64-Debug-Android" }
+      builders { name: "Build-Ubuntu-Clang-arm64-Debug-Android_FrameworkDefs" }
+      builders { name: "Build-Ubuntu-Clang-mips64el-Debug-Android" }
+      builders { name: "Build-Ubuntu-Clang-x86_64-Debug" }
+      builders { name: "Build-Ubuntu-GCC-x86_64-Release" }
       builders { name: "Housekeeper-PerCommit-InfraTests" }
       builders { name: "Skia Presubmit" }
-      builders { name: "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android" }
-      builders { name: "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN" }
-      builders { name: "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN" }
+      builders { name: "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android" }
+      builders { name: "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug" }
+      builders { name: "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release" }
     }
     try_job_retry_config {
       try_job_retry_quota: 1