Non-SFI Mode: Add disable_nacl_untrusted==0 to the condition of nacl_helper_nonsfi creation.

nacl_helper_nonsfi is actually NOT the untrusted code, but this is built by
the PNaCl toolchain, which is native_client untrusted toolchain in the
context of common.gypi. In order to keep the other _nacl.gyp files simple,
this CL adds disable_nacl_untrusted==0 guard to the nacl_helper_nonsfi
creating condition, so that it does not cause the gyp error due to depending
on missing targets when disable_nacl_untrusted is set to 1.

BUG=358465
TEST=Ran trybots.

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

Cr-Commit-Position: refs/heads/master@{#300290}

components/nacl_nonsfi.gyp

@@ -10,7 +10,7 @@
     '../build/common_untrusted.gypi',
   ],
   'conditions': [
-    ['disable_nacl==0', {
+    ['disable_nacl==0 and disable_nacl_untrusted==0', {
       'targets': [
         {
           # Currently, nacl_helper_nonsfi is under development and the binary
@@ -47,10 +47,10 @@
             ],
           },
           'dependencies': [
-            '<(DEPTH)/base/base_nacl.gyp:base_nacl_nonsfi',
-            '<(DEPTH)/native_client/src/nonsfi/irt/irt.gyp:nacl_sys_private',
-            '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib',
-            '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+            '../base/base_nacl.gyp:base_nacl_nonsfi',
+            '../native_client/src/nonsfi/irt/irt.gyp:nacl_sys_private',
+            '../native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib',
+            '../native_client/tools.gyp:prep_toolchain',
           ],
         },
         # TODO(hidehiko): Add Non-SFI version of nacl_loader_unittests.