Android WebView: don't specify cpu-specific cflags.

The WebView build gets its cpu-specific flags from the Android build
system's current target; specifying them in gyp just causes conflicts,
so don't bother.

BUG=

Review URL: https://codereview.chromium.org/12463031

git-svn-id: http://src.chromium.org/svn/trunk/src/build@188122 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

common.gypi

@@ -2719,12 +2719,12 @@
                   '-Wno-abi',
                 ],
                 'conditions': [
-                  ['arm_thumb==1', {
+                  ['arm_thumb==1 and android_webview_build==0', {
                     'cflags': [
                     '-mthumb',
                     ]
                   }],
-                  ['armv7==1', {
+                  ['armv7==1 and android_webview_build==0', {
                     'cflags': [
                       '-march=armv7-a',
                       '-mtune=cortex-a8',
@@ -2763,10 +2763,10 @@
                         '-fuse-ld=gold',
                     ],
                     'conditions': [
-                      ['arm_thumb==1', {
+                      ['arm_thumb==1 and android_webview_build==0', {
                         'cflags': [ '-mthumb-interwork' ],
                       }],
-                      ['armv7==0', {
+                      ['armv7==0 and android_webview_build==0', {
                         # Flags suitable for Android emulator
                         'cflags': [
                           '-march=armv5te',