Pull GN @ 252040, update calls

build/config/android/config.gni

Index: build/config/android/config.gni
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index c7408127276ec6fa8723c82f74d4fc6a5aeda701..d012d2b597e3177b6d488641150ae4f56e5515d1 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -4,20 +4,17 @@
 
 # This file contains common system config stuff for the Android build.
 
-# TODO(brettw) bug 341772 put this into the is_android block when the toolchain
-# stuff is fixed in the GYP generator. The problem is that when we redo the
-# build in host mode, the OS is not android and the declarations are never
-# seen, which throws an error because these arguments are specified.
-declare_args() {
-  android_src = ""
+if (is_android) {
+  declare_args() {
+    # Absolute directory containing the Android source code.
+    android_src = ""
 
-  # This is set when building the Android WebView inside the Android build
-  # system, using the 'android' gyp backend. The WebView code is still built
-  # when this is unset, but builds using the normal chromium build system.
-  is_android_webview_build = false
-}
+    # This is set when building the Android WebView inside the Android build
+    # system, using the 'android' gyp backend. The WebView code is still built
+    # when this is unset, but builds using the normal chromium build system.
+    is_android_webview_build = false
+  }
 
-if (is_android) {
   if (is_android_webview_build) {
     assert(android_src != "",
            "You must specify android_src for an Android WebView build.")
@@ -26,8 +23,7 @@ if (is_android) {
   # android_ndk_root -----------------------------------------------------------
 
   # Full system path to the Android NDK.
-  android_ndk_root =
-    rebase_path("//third_party/android_tools/ndk", ".", "")
+  android_ndk_root = rebase_path("//third_party/android_tools/ndk")
 
   # stlport stuff --------------------------------------------------------------