Fix order of includes in base_nacl.gyp

base/base_nacl.gyp

Index: base/base_nacl.gyp
diff --git a/base/base_nacl.gyp b/base/base_nacl.gyp
index 63e1ed422bde1f695ff42276283b815877b77ffe..90a2893060a37efc2224b89a20384c15a6b484ce 100644
--- a/base/base_nacl.gyp
+++ b/base/base_nacl.gyp
@@ -7,8 +7,12 @@
     'chromium_code': 1,
   },
   'includes': [
-    '../build/common_untrusted.gypi',
+    # base.gypi must be included before common_untrusted.gypi.
+    #
+    # TODO(sergeyu): Replace the target_defaults magic in base.gypi with a
+    # sources variables lists. That way order of includes will not matter.
     'base.gypi',
+    '../build/common_untrusted.gypi',
   ],
   'conditions': [
     ['disable_nacl==0 and disable_nacl_untrusted==0', {