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

tools/dm_flags.json

Index: tools/dm_flags.json
diff --git a/tools/dm_flags.json b/tools/dm_flags.json
index 3a7559164dfba9c693c3877a9aafd3237713af71..c90f50ed2b9f7dfa8c971be1311c41a8b7b922e8 100644
--- a/tools/dm_flags.json
+++ b/tools/dm_flags.json
@@ -5,7 +5,6 @@
     "8888", 
     "gpu", 
     "nvprmsaa4", 
-    "angle", 
     "serialize-8888", 
     "tiles_rt-8888", 
     "pipe-8888", 
@@ -46,7 +45,6 @@
     "8888", 
     "gpu", 
     "nvprmsaa4", 
-    "angle", 
     "--blacklist", 
     "gpu", 
     "_", 
@@ -83,7 +81,6 @@
     "8888", 
     "gpu", 
     "nvprmsaa4", 
-    "angle", 
     "serialize-8888", 
     "tiles_rt-8888", 
     "pipe-8888", 
@@ -104,7 +101,6 @@
     "8888", 
     "gpu", 
     "nvprmsaa4", 
-    "angle", 
     "serialize-8888", 
     "tiles_rt-8888", 
     "pipe-8888", 
@@ -118,5 +114,24 @@
     "PANO_20121023_214540.jpg", 
     "--match", 
     "~Threaded"
+  ], 
+  "Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE": [
+    "--config", 
+    "565", 
+    "8888", 
+    "gpu", 
+    "nvprmsaa4", 
+    "serialize-8888", 
+    "tiles_rt-8888", 
+    "pipe-8888", 
+    "tiles_rt-gpu", 
+    "angle", 
+    "--blacklist", 
+    "gpu", 
+    "_", 
+    "PANO_20121023_214540.jpg", 
+    "msaa", 
+    "_", 
+    "PANO_20121023_214540.jpg"
   ]
 }