Remove skia_arch_width, fold into skia_arch_type.

platform_tools/android/gyp/skia_android.gypi

Index: platform_tools/android/gyp/skia_android.gypi
diff --git a/platform_tools/android/gyp/skia_android.gypi b/platform_tools/android/gyp/skia_android.gypi
index e8bf1c3150d221c4e9a2ffa569edb4a81c5e3310..783c8ecbfaddcdec7ac69f127c59c15ba1488b59 100644
--- a/platform_tools/android/gyp/skia_android.gypi
+++ b/platform_tools/android/gyp/skia_android.gypi
@@ -25,10 +25,10 @@
       [ '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",
       }],
     ],