Revert 135087 - This patch is to enable x86 android build.

build/common.gypi

Index: build/common.gypi
===================================================================
--- build/common.gypi	(revision 135094)
+++ build/common.gypi	(working copy)
@@ -823,16 +823,7 @@
         'variables': {
           'variables': {
             'android_ndk_root%': '<!(/bin/echo -n $ANDROID_NDK_ROOT)',
-            # Android uses x86 instead of ia32 for their target_arch 
-            # designation.
-            # TODO(wistoch): Adjust the target_arch naming scheme to avoid 
-            # confusion.
-            # http://crbug.com/125329
-            'conditions': [
-              ['target_arch == "ia32"', {
-                'target_arch': 'x86',
-              }],
-            ],
+            'target_arch%': 'arm',  # target_arch in android terms.
 
             # Switch between different build types, currently only '0' is
             # supported.
@@ -987,7 +978,7 @@
         ],
       }],
 
-      ['os_posix==1 and chromeos==0 and OS!="android"', {
+      ['os_posix==1 and chromeos==0 and target_arch!="arm"', {
         'use_cups%': 1,
       }, {
         'use_cups%': 0,
@@ -2390,17 +2381,10 @@
             'ldflags': [
               '-nostdlib',
               '-Wl,--no-undefined',
+              '-Wl,--icf=safe',  # Enable identical code folding to reduce size
               # Don't export symbols from statically linked libraries.
               '-Wl,--exclude-libs=ALL',
             ],
-            'conditions': [
-              ['target_arch == "arm"', {
-                'ldflags': [
-                  # Enable identical code folding to reduce size.
-                  '-Wl,--icf=safe', 
-                ],
-              }],
-            ],
             'libraries': [
               '-l<(android_stlport_library)',
               # Manually link the libgcc.a that the cross compiler uses.