Revert "switch all the arm7 devices to build with thumb for a while"

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 c3e217512c0965d9f7abe416c74e23c07893942b..ca900ad2bbdf257cfcc66173a1ddc9edf8381bf6 100755
--- a/platform_tools/android/bin/android_setup.sh
+++ b/platform_tools/android/bin/android_setup.sh
@@ -141,16 +141,30 @@ setup_device() {
 
   case $TARGET_DEVICE in
     nexus_s)
+        DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 armv7=1 arm_thumb=0"
+        DEFINES="${DEFINES} skia_texture_cache_mb_limit=24"
+        ;;
+    nexus_s_thumb)
         DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 armv7=1 arm_thumb=1"
         DEFINES="${DEFINES} skia_texture_cache_mb_limit=24"
         ;;
     nexus_4 | nexus_7 | nexus_10)
+        DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 armv7=1 arm_thumb=0"
+        ;;
+    nexus_4_thumb | nexus_7_thumb | nexus_10_thumb)
         DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 armv7=1 arm_thumb=1"
         ;;
     xoom)
+        DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 armv7=1 arm_thumb=0"
+        ;;
+    xoom_thumb)
         DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 armv7=1 arm_thumb=1"
         ;;
     galaxy_nexus)
+        DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 armv7=1 arm_thumb=0"
+        DEFINES="${DEFINES} skia_texture_cache_mb_limit=32"
+        ;;
+    galaxy_nexus_thumb)
         DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 armv7=1 arm_thumb=1"
         DEFINES="${DEFINES} skia_texture_cache_mb_limit=32"
         ;;