roll gyp 1384:1386

1385: Allow multiple possibe error codes for the "status" parameter. (test-only)
1386: make: Support '#' characters in defines. Fixes mac shared bot.

BUG=none
TEST=mac shared bot goes green after r137795
TBR=scottmg

Review URL: https://chromiumcodereview.appspot.com/10409020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137819 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/DEPS b/DEPS
index b7a73f4..d52c2dd3 100644
--- a/DEPS
+++ b/DEPS
@@ -121,7 +121,7 @@
     (Var("googlecode_url") % "grit-i18n") + "/trunk@37",
 
   "src/tools/gyp":
-    (Var("googlecode_url") % "gyp") + "/trunk@1384",
+    (Var("googlecode_url") % "gyp") + "/trunk@1386",
 
   "src/v8":
     (Var("googlecode_url") % "v8") + "/trunk@" + Var("v8_revision"),