Revert of Default SK_ANGLE to true on Windows, run angle whenever possible on bots.

tools/dm_flags.py

Index: tools/dm_flags.py
diff --git a/tools/dm_flags.py b/tools/dm_flags.py
index c41a003c51d0d8e4cfc4f41c606e3f73bec27e24..985a62adf573e2cad0110187b64924cd942bb368 100755
--- a/tools/dm_flags.py
+++ b/tools/dm_flags.py
@@ -22,13 +22,15 @@
 def get_args(bot):
   args = []
 
-  configs = ['565', '8888', 'gpu', 'nvprmsaa4', 'angle']
+  configs = ['565', '8888', 'gpu', 'nvprmsaa4']
   # Xoom and NP are running out of RAM when we run all these modes.  skia:3255
   if ('Xoom'        not in bot and
       'NexusPlayer' not in bot):
     configs.extend(mode + '-8888' for mode in
                    ['serialize', 'tiles_rt', 'pipe'])
     configs.append('tiles_rt-gpu')
+  if 'ANGLE' in bot:
+    configs.append('angle')
   args.append('--config')
   args.extend(configs)
 
@@ -86,6 +88,7 @@
     'Test-Android-Xoom-Tegra2-Arm7-Release',
     'Test-ChromeOS-Alex-GMA3150-x86-Debug',
     'Test-Ubuntu12-ShuttleA-GTX550Ti-x86_64-Release-Valgrind',
+    'Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE',
   ]
 
   cov = coverage.coverage()