Remove skia_arch_width, fold into skia_arch_type.

gyp/tools.gyp

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
     # GYP file to build various tools.
 #
 # To build on Linux:
 #  ./gyp_skia tools.gyp && make tools
 #
 {
@@ skipping 501 matching lines @@
         ['skia_win_debuggers_path and skia_os == "win"',
           {
             'dependencies': [
               'tools.gyp:win_dbghelp',
             ],
           },
         ],
         # VS static libraries don't have a linker option. We must set a global
         # project linker option, or add it to each executable.
         ['skia_win_debuggers_path and skia_os == "win" and '
-         'skia_arch_width == 64',
+         'skia_arch_type == "x86_64"',
           {
             'msvs_settings': {
               'VCLinkerTool': {
                 'AdditionalDependencies': [
                   '<(skia_win_debuggers_path)/x64/DbgHelp.lib',
                 ],
               },
             },
           },
         ],
         ['skia_win_debuggers_path and skia_os == "win" and '
-         'skia_arch_width == 32',
+         'skia_arch_type == "x86"',
           {
             'msvs_settings': {
               'VCLinkerTool': {
                 'AdditionalDependencies': [
                   '<(skia_win_debuggers_path)/DbgHelp.lib',
                 ],
               },
             },
           },
         ],
@@ skipping 238 matching lines @@
               'flags.gyp:flags',
               'skia_lib.gyp:skia_lib',
               'resources',
             ],
           },
         ],
       },
     ],
   ],
 }