Slim the CQ down to the GN bots, where they exist.

infra/branch-config/cq.cfg

Index: infra/branch-config/cq.cfg
diff --git a/infra/branch-config/cq.cfg b/infra/branch-config/cq.cfg
index df83a98533363dca714182d582e079fcf0db2b6a..78b0dc74c0e565513cc2d2a57d35b80a746e277c 100644
--- a/infra/branch-config/cq.cfg
+++ b/infra/branch-config/cq.cfg
@@ -27,22 +27,19 @@ verifiers {
   try_job {
     buckets {
       name: "master.client.skia"
-      builders { name: "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot" }
+      builders { name: "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN-Trybot" }
       builders { name: "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared-Trybot" }
-      builders { name: "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-Trybot" }
+      builders { name: "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN-Trybot" }
     }
     buckets {
       name: "master.client.skia.compile"
       builders { name: "Build-Mac-Clang-x86_64-Release-GN-Trybot" }
-      builders { name: "Build-Mac-Clang-x86_64-Release-Trybot" }
       builders { name: "Build-Ubuntu-Clang-x86_64-Debug-GN-Trybot" }
-      builders { name: "Build-Ubuntu-Clang-x86_64-Debug-Trybot" }
       builders { name: "Build-Ubuntu-GCC-Arm64-Debug-Android-Trybot" }
       builders { name: "Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot" }
       builders { name: "Build-Ubuntu-GCC-Mips-Debug-Android-Trybot" }
       builders { name: "Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot" }
       builders { name: "Build-Ubuntu-GCC-x86_64-Release-GN-Trybot" }
-      builders { name: "Build-Ubuntu-GCC-x86_64-Release-Trybot" }
       builders { name: "Build-Win-MSVC-x86-Debug-Trybot" }
       builders { name: "Build-Win-MSVC-x86_64-Debug-Trybot" }
       builders { name: "Build-Win-MSVC-x86_64-Release-Vulkan-Trybot" }