Rolling deps, making mojo work with new NaCl gn setup.

mojo/nacl/BUILD.gn

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Trusted code
 if (!is_nacl) {
   # A simple shell for running untrusted binaries that talk to the Mojo
   # embedder. (No services.)
   executable("monacl_shell") {
     testonly = true
     sources = [
       "monacl_shell.cc",
     ]
     deps = [
       "//base:base",
       "//mojo/edk/system:system",
       "//nacl_bindings:monacl_sel",
     ]
 
-    data_deps = [ "//nacl_bindings:irt_mojo(//native_client/build/toolchain/nacl:irt_${target_cpu})" ]
+    data_deps =
+        [ "//nacl_bindings:irt_mojo(//build/toolchain/nacl:irt_${target_cpu})" ]
   }
 
   if (current_cpu == "x86") {
     # Non-SFI NaCl currently supports x86-32 but not x86-64. Additionally,
     # PNaCl pexes assume 32-bit pointers.
     executable("monacl_shell_nonsfi") {
       testonly = true
       sources = [
         "monacl_shell_nonsfi.cc",
       ]
@@ skipping 73 matching lines @@
 group("mojo_nacl") {
   deps = [
     "//services/nacl:nacl_content_handler",
     "//services/nacl:nacl_content_handler_nonsfi",
   ]
 }
 
 group("mojo_pnacl_tests") {
   testonly = true
   deps = [
-    ":monacl_test(//native_client/build/toolchain/nacl:newlib_pnacl)",
+    ":monacl_test(//build/toolchain/nacl:newlib_pnacl)",
   ]
 }
 
 group("mojo_nacl_tests") {
   testonly = true
   deps = [
-    ":mojo_nacl_tests_untrusted(//native_client/build/toolchain/nacl:clang_newlib_${current_cpu})",
+    ":mojo_nacl_tests_untrusted(//build/toolchain/nacl:clang_newlib_${current_cpu})",
     ":monacl_shell",
     ":monacl_shell_nonsfi_x86",
     ":mojo_pnacl_tests",
   ]
 }