Reland "Update cq.cfg for new compile-only builders."

infra/config/cq.cfg

@@ -17,21 +17,20 @@ verifiers {
       builders { name: "android_angle_rel_ng" }
       builders { name: "android_angle_deqp_rel_ng" }
       builders { name: "linux_angle_rel_ng" }
-      builders { name: "linux_angle_dbg_ng" }
+      builders { name: "linux_angle_compile_dbg_ng" }
       builders { name: "linux_angle_deqp_rel_ng" }
       builders { name: "linux_angle_ozone_rel_ng" }
       builders { name: "mac_angle_rel_ng" }
-      builders { name: "mac_angle_dbg_ng" }
+      builders { name: "mac_angle_compile_dbg_ng" }
       builders { name: "win_angle_rel_ng" }
-      builders { name: "win_angle_dbg_ng" }
-      builders { name: "win_angle_x64_rel_ng" }
-      builders { name: "win_angle_x64_dbg_ng" }
+      builders { name: "win_angle_compile_dbg_ng" }
+      builders { name: "win_angle_compile_x64_rel_ng" }
+      builders { name: "win_angle_compile_x64_dbg_ng" }
       builders { name: "win_angle_deqp_rel_ng" }
-      builders { name: "win_angle_x64_deqp_rel_ng" }
     }
     buckets {
       name: "master.tryserver.chromium.win"
-      builders { name: "win_clang" }
+      builders { name: "win-msvc-rel" }
     }
   }
 }