Remove skia_arch_width, fold into skia_arch_type.

platform_tools/android/bin/android_setup.sh

Index: platform_tools/android/bin/android_setup.sh
diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh
index efa58809324db1c41cbc77e850f880c614128526..2680ba997c8a2162dc3e258c53268eebedcdb4e6 100755
--- a/platform_tools/android/bin/android_setup.sh
+++ b/platform_tools/android/bin/android_setup.sh
@@ -119,7 +119,7 @@ setup_device() {
       ANDROID_ARCH="arm"
       ;;
     arm64 | nexus_9)
-      DEFINES="${DEFINES} skia_arch_type=arm64 skia_arch_width=64"
+      DEFINES="${DEFINES} skia_arch_type=arm64"
       ANDROID_ARCH="arm64"
       ;;
     x86)
@@ -131,17 +131,17 @@ setup_device() {
       ANDROID_ARCH="x86_64"
       ;;
     mips)
-      DEFINES="${DEFINES} skia_arch_type=mips skia_arch_width=32"
+      DEFINES="${DEFINES} skia_arch_type=mips32"
       DEFINES="${DEFINES} skia_resource_cache_mb_limit=32"
       ANDROID_ARCH="mips"
       ;;
     mips_dsp2)
-      DEFINES="${DEFINES} skia_arch_type=mips skia_arch_width=32"
+      DEFINES="${DEFINES} skia_arch_type=mips32"
       DEFINES="${DEFINES} mips_arch_variant=mips32r2 mips_dsp=2"
       ANDROID_ARCH="mips"
       ;;
     mips64)
-      DEFINES="${DEFINES} skia_arch_type=mips skia_arch_width=64"
+      DEFINES="${DEFINES} skia_arch_type=mips64"
       ANDROID_ARCH="mips64"
       ;;
     *)