Really fix the arm builder bots by copying android_webview_build out one scope in toolchain.gypi

Move android_webview_build variable to toolchain.gypi to fix arm builders.

R=jkummerow@chromium.org

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

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22473 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

build/android.gypi

@@ -61,8 +61,6 @@
     # link the NDK one?
     'use_system_stlport%': '<(android_webview_build)',
     'android_stlport_library': 'stlport_static',
-    # Copy it out one scope.
-    'android_webview_build%': '<(android_webview_build)',
   },  # variables
   'target_defaults': {
     'defines': [

build/toolchain.gypi

@@ -87,7 +87,9 @@
       # This is set when building the Android WebView inside the Android build
       # system, using the 'android' gyp backend.
       'android_webview_build%': 0,
-    }
+    },
+    # Copy it out one scope.
+    'android_webview_build%': '<(android_webview_build)',
   },
   'conditions': [
     ['host_arch=="ia32" or host_arch=="x64" or clang==1', {