Remove skia_arch_width, fold into skia_arch_type.

platform_tools/android/gyp/dependencies.gypi

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This GYP file stores the dependencies necessary to build Skia on the Android
 # platform. The OS doesn't provide many stable libraries as part of the
 # distribution so we have to build a few of them ourselves.
 #
 # NOTE: We tried adding the gyp file to the android/ directory at the root of
@@ skipping 177 matching lines @@
             'sources' : [
               '../third_party/externals/jpeg/armv6_idct.S',
               '../third_party/externals/jpeg/jsimd_arm_neon.S',
               '../third_party/externals/jpeg/jsimd_neon.c',
             ],
             'defines' : [
               'NV_ARM_NEON',
             ],
           },
         ],
-        [ 'skia_arch_type == "mips" and mips_dsp == 2',
+        [ '"mips" in skia_arch_type and mips_dsp == 2',
           {
             'sources' : [
               '../third_party/externals/jpeg/mips_jidctfst.c',
               '../third_party/externals/jpeg/mips_idct_le.S',
             ],
             'defines' : [
               'ANDROID_MIPS_IDCT',
             ],
           },
         ],
@@ skipping 111 matching lines @@
           '../../../tools/VisualBench/',
         ],
         'sources': [
           '../visualbench/jni/SkOSWindow_AndroidNative.cpp',
           '../visualbench/jni/main.cpp',
         ],
       },
     },
   ]
 }