Remove skia_arch_width, fold into skia_arch_type.

platform_tools/android/gyp/skia_android.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.
 #
 {
   'variables': {
     'conditions': [
       [ 'skia_arch_type == "arm" and arm_version != 7', {
         'android_arch%': "armeabi",
       }],
       [ 'skia_arch_type == "arm" and arm_version == 7', {
         'android_arch%': "armeabi-v7a",
       }],
       [ 'skia_arch_type == "arm64"', {
         'android_arch%': "arm64-v8a",
       }],
       [ 'skia_arch_type == "x86"', {
         'android_arch%': "x86",
       }],
       [ 'skia_arch_type == "x86_64"', {
         'android_arch%': "x86_64",
       }],
-      [ 'skia_arch_type == "mips" and skia_arch_width == 32', {
+      [ 'skia_arch_type == "mips32"', {
         'android_arch%': "mips",
       }],
-      [ 'skia_arch_type == "mips" and skia_arch_width == 64', {
+      [ 'skia_arch_type == "mips64"', {
         'android_arch%': "mips64",
       }],
     ],
   },
   'targets': [
     {
       'target_name': 'CopySampleAppDeps',
       'type': 'none',
       'dependencies': [
         'skia_lib.gyp:skia_lib',
@@ skipping 130 matching lines @@
             '-Dnative.libs.absolute.dir=<(ANDROID_OUT)/libs',
             '-Dout.final.file=<(ANDROID_OUT)/bin/VisualBench.apk',
             '-Dsdk.dir=<(ANDROID_SDK_ROOT)',
             'debug',
           ],
         },
       ],
     },
   ],
 }