Update Chomium's build files to work w/ latest GN binaries.

mojo/nacl/BUILD.gn

 # All toolchains use the same generated code.
 gen_dir = "$root_build_dir/gen/mojo/nacl"
 
 # Only allow the generator to be run by one toolchain.
 if (current_toolchain == default_toolchain) {
   # Generate the code to plumb the Mojo public API into the NaCl sandbox.
   action("mojo_nacl_codegen") {
     script = "generator/generate_nacl_bindings.py"
     args = [
       "-d",
@@ skipping 72 matching lines @@
       "//testing/gtest:gtest_main",
       "//third_party/mojo/src/mojo/public/c/system/tests:tests",
       "//third_party/mojo/src/mojo/public/cpp/system:system",
       ":mojo",
     ]
   }
 }
 
 group("mojo_nacl") {
   deps = [
-    "//native_client/src/untrusted/irt:irt_core(//native_client/build/toolchain/nacl:irt_${cpu_arch})",
+    "//native_client/src/untrusted/irt:irt_core(//native_client/build/toolchain/nacl:irt_${current_cpu})",
   ]
 }
 
 group("mojo_nacl_tests") {
   testonly = true
   deps = [
     ":monacl_shell",
-    ":monacl_test(//native_client/build/toolchain/nacl:clang_newlib_${cpu_arch})",
+    ":monacl_test(//native_client/build/toolchain/nacl:clang_newlib_${current_cpu})",
   ]
 }