slave_hosts_cfg: Use new Windows GCE instances, use fewer, 16-core GCE instances

master/skia_master_scripts/factory.py

Index: master/skia_master_scripts/factory.py
diff --git a/master/skia_master_scripts/factory.py b/master/skia_master_scripts/factory.py
index 6e40aa742d97143896034511ae2a147090e3fd04..cf204b0e7456990ed74d92c0fef4f9d359ce1870 100644
--- a/master/skia_master_scripts/factory.py
+++ b/master/skia_master_scripts/factory.py
@@ -778,10 +778,10 @@ class SkiaFactory(BuildFactory):
       self.UpdateSteps()
       if not self._build_targets:
         self._build_targets = []
-        if (('Win7' in self._builder_name and 'x86_64' in self._builder_name) or
+        if (('Win' in self._builder_name) or
             ('Ubuntu' in self._builder_name and 'x86-' in self._builder_name) or
             'Mac10.6' in self._builder_name or 'Mac10.7' in self._builder_name):
-          # Don't compile the debugger in 64-bit Win7, Mac 10.6, Mac 10.7, or
+          # Don't compile the debugger on Windows, 64-bit Mac 10.6, Mac 10.7, or
           # 32-bit Linux since the Qt SDK doesn't include libraries for those
           # platforms.
           self._build_targets.append('most')