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

platform_tools/android/bin/android_setup.sh

 function exportVar {
   NAME=$1
   VALUE=$2
   echo export $NAME=\"$VALUE\"
   export $NAME="$VALUE"
 }
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # A valid Android SDK installation is required to build the sample app.
@@ skipping 123 matching lines @@
   # Setup the build variation depending on the target device
   TARGET_DEVICE="$1"
 
   if [ -z "$TARGET_DEVICE" ]; then
     echo "INFO: no target device type was specified so using the default 'arm_v7'"
     TARGET_DEVICE="arm_v7"
   fi
 
   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"
         ;;
     razr_i)
         DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32"
         DEFINES="${DEFINES} skia_texture_cache_mb_limit=32"
         ;;
     arm_v7)
         DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 armv7=1 arm_thumb=0"
         ;;
@@ skipping 49 matching lines @@
     if [ "${ANDROID_MD5:0:32}" != "${HOST_MD5:0:32}" ];
     then
       $ADB pull $ANDROID_SRC $HOST_DST
 #   else
 #      echo "md5 match of android [$ANDROID_SRC] and host [$HOST_DST]"
     fi
   else
     $ADB pull $ANDROID_SRC $HOST_DST
   fi
 }