Update from https://crrev.com/327068

mojo/public/tools/BUILD.gn

Index: mojo/public/tools/BUILD.gn
diff --git a/mojo/public/tools/BUILD.gn b/mojo/public/tools/BUILD.gn
index 8b47bb91dacc98485f2e3277c3ba5ccc3688089f..a5fcc871b7c73610b5ae6646131dd99bd487b953 100644
--- a/mojo/public/tools/BUILD.gn
+++ b/mojo/public/tools/BUILD.gn
@@ -38,7 +38,7 @@ if (mojo_use_prebuilt_network_service) {
       ]
     } else {
       if (is_android) {
-        assert(cpu_arch == "arm",
+        assert(target_cpu == "arm",

[Nick Bray (chromium), 2015/05/05 23:27:23]

current_cpu?  Your commit message says "target_cpu", but at least in the file
before this you also used "current_cpu".  I think that in almost all cases you
should just use current_cpu.

target_cpu => the CPU GN has been invoked to target.
current_cpu => the CPU GN is actually building this target for.

This distinction is subtle and really only matters in a few specific cases, but
consistency is good.

                "Only arm version prebuilt netowrk_service.mojo is available.")
         sources = [
           "prebuilt/network_service/android-arm/$filename",
@@ -66,7 +66,7 @@ if (mojo_use_prebuilt_network_service) {
     } else {
       if (is_android) {
         assert(
-            cpu_arch == "arm",
+            target_cpu == "arm",
             "Only arm version prebuilt netowrk_service_apptests.mojo is available.")
         sources = [
           "prebuilt/network_service_apptests/android-arm/$filename",