Eliminate build differences in nacl gated on nacl_standalone.

src/trusted/nonnacl_util/nonnacl_util.gyp

Index: src/trusted/nonnacl_util/nonnacl_util.gyp
diff --git a/src/trusted/nonnacl_util/nonnacl_util.gyp b/src/trusted/nonnacl_util/nonnacl_util.gyp
index 7c4ec0e7a76784d4dc35e1a66462a979a96dd298..ec3df80ba66d9fbe67c29570fb3183fb347f8896 100644
--- a/src/trusted/nonnacl_util/nonnacl_util.gyp
+++ b/src/trusted/nonnacl_util/nonnacl_util.gyp
@@ -64,6 +64,14 @@
         'nonnacl_util.gypi',
       ],
     },
+    # ----------------------------------------------------------------
+    {
+      'target_name': 'nonnacl_util_chrome',
+      'type': 'static_library',
+      'dependencies': [
+        'sel_ldr_launcher',
+      ],
+    },
   ],
   # ----------------------------------------------------------------------
   'conditions': [
@@ -96,22 +104,6 @@
             'nonnacl_util.gypi',
           ],
         },
-      ],
-    }],
-    ['nacl_standalone==0', {
-      'targets': [
-        # ----------------------------------------------------------------
-        {
-          'target_name': 'nonnacl_util_chrome',
-          'type': 'static_library',
-          'dependencies': [
-            'sel_ldr_launcher',
-          ],
-        },
-      ],
-    }],
-    ['OS=="win" and nacl_standalone==0', {
-      'targets': [
         # ----------------------------------------------------------------
         {
           'target_name': 'nonnacl_util_chrome64',