Remove skia_arch_width, fold into skia_arch_type.

gyp/common_conditions.gypi

Index: gyp/common_conditions.gypi
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index c4d0d017b08fe2e40e56972fff215bd2b448f7ac..46ed68c538755a94169992a9aec2a8ea184cdaf7 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -161,10 +161,10 @@
               },
             },
           }],
-          [ 'skia_arch_width == 64', {
+          [ 'skia_arch_type == "x86_64"', {
             'msvs_configuration_platform': 'x64',
           }],
-          [ 'skia_arch_width == 32', {
+          [ 'skia_arch_type == "x86"', {
             'msvs_configuration_platform': 'Win32',
           }],
           [ 'skia_warnings_as_errors', {
@@ -294,7 +294,7 @@
               }],
             ],
           }],
-          [ 'skia_arch_type == "mips"', {
+          [ '"mips" in skia_arch_type', {
             'cflags': [
               '-EL',
             ],
@@ -495,8 +495,8 @@
           'conditions': [
             [ 'skia_fast', { 'WARNING_CFLAGS': [ '<@(skia_fast_flags)' ] } ],
             [ 'skia_warnings_as_errors', { 'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES' }],
-            [ 'skia_arch_width == 32', { 'ARCHS': ['i386']   }],
-            [ 'skia_arch_width == 64', { 'ARCHS': ['x86_64'] }],
+            [ 'skia_arch_type == "x86"', { 'ARCHS': ['i386']   }],
+            [ 'skia_arch_type == "x86_64"', { 'ARCHS': ['x86_64'] }],
             [ 'skia_osx_deployment_target==""', {
               'MACOSX_DEPLOYMENT_TARGET': '10.6', # -mmacos-version-min, passed in env to ld.
             }, {