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

gyp/common_variables.gypi

Index: gyp/common_variables.gypi
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index 3c9aae5412a8443ee5493278abb0eebf8de5aa3b..97501871a9a0607884aadd204199c57fff678135 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -83,10 +83,8 @@
         }],
         [ 'skia_os == "win"', {
           'os_posix%': 0,
-          'skia_angle%': 1,
         }, {
           'os_posix%': 1,
-          'skia_angle%': 0,
         }],
         [ 'skia_os in ["linux"]', {
           'skia_poppler_enabled%': 1,
@@ -149,6 +147,7 @@
       'skia_android_path_rendering%': 0,
       'skia_resource_cache_mb_limit%': 0,
       'skia_resource_cache_count_limit%': 0,
+      'skia_angle%': 0,
       'skia_gdi%': 0,
       'skia_gpu%': 1,
       'skia_osx_deployment_target%': '',