Fix the android_webview build's gyp files after the changes in r22444.

build/toolchain.gypi

Index: build/toolchain.gypi
diff --git a/build/toolchain.gypi b/build/toolchain.gypi
index 6cad1e2d0a2c233a0642a06e92a39cf3ffbf6b7f..8c6df83549d8e4544cc5e73ec2671bcda18eb391 100644
--- a/build/toolchain.gypi
+++ b/build/toolchain.gypi
@@ -143,7 +143,7 @@
         'target_conditions': [
           ['_toolset=="host"', {
             'conditions': [
-              ['v8_target_arch==host_arch', {
+              ['v8_target_arch==host_arch and android_webview_build==0', {
                 # Host built with an Arm CXX compiler.
                 'conditions': [
                   [ 'arm_version==7', {
@@ -186,7 +186,7 @@
           }],  # _toolset=="host"
           ['_toolset=="target"', {
             'conditions': [
-              ['v8_target_arch==target_arch', {
+              ['v8_target_arch==target_arch and android_webview_build==0', {
                 # Target built with an Arm CXX compiler.
                 'conditions': [
                   [ 'arm_version==7', {
@@ -250,7 +250,7 @@
           'V8_TARGET_ARCH_MIPS',
         ],
         'conditions': [
-          ['v8_target_arch==target_arch', {
+          ['v8_target_arch==target_arch and android_webview_build==0', {
             # Target built with a Mips CXX compiler.
             'target_conditions': [
               ['_toolset=="target"', {
@@ -299,7 +299,7 @@
           'V8_TARGET_ARCH_MIPS',
         ],
         'conditions': [
-          ['v8_target_arch==target_arch', {
+          ['v8_target_arch==target_arch and android_webview_build==0', {
             # Target built with a Mips CXX compiler.
             'target_conditions': [
               ['_toolset=="target"', {
@@ -354,7 +354,7 @@
           'V8_TARGET_ARCH_MIPS64',
         ],
         'conditions': [
-          ['v8_target_arch==target_arch', {
+          ['v8_target_arch==target_arch and android_webview_build==0', {
             # Target built with a Mips CXX compiler.
             'target_conditions': [
               ['_toolset=="target"', {