Revert "Use thumb versions of external libraries with ARMv7."

build/android/setup.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'conditions': [
     ['component == "shared_library"', {
       'targets': [
         {
           # These libraries from the Android ndk are required to be packaged with
           # any APK that is built with them. build/java_apk.gypi expects any
           # libraries that should be packaged with the apk to be in
           # <(SHARED_LIB_DIR)
           'target_name': 'copy_system_libraries',
           'type': 'none',
-          'conditions': [
-            ['target_arch=="arm" and arm_thumb==1', {
-              'copies': [
-                {
-                  'destination': '<(SHARED_LIB_DIR)/',
-                  'files': [
-                    '<(android_stlport_libs_dir)/thumb/libstlport_shared.so',
-                  ],
-                },
+          'copies': [
+            {
+              'destination': '<(SHARED_LIB_DIR)/',
+              'files': [
+                '<(android_stlport_libs_dir)/libstlport_shared.so',
               ],
-            }, {
-              'copies': [
-                {
-                  'destination': '<(SHARED_LIB_DIR)/',
-                  'files': [
-                    '<(android_stlport_libs_dir)/libstlport_shared.so',
-                  ],
-                },
-              ],
-            }],
+            },
           ],
         },
       ],
     }],
   ],
   'targets': [
     {
       'target_name': 'get_build_device_configurations',
       'type': 'none',
       'actions': [
@@ skipping 41 matching lines @@
             'mkdir',
             '-p',
             '<@(output_dirs)',
           ],
         },
       ],
     }, # build_output_dirs
   ]
 }