Sync gyp on all platforms to fix the build error.

DEPS

 # This file is automatically processed to create .DEPS.git which is the file
 # that gclient uses under git.
 #
 # See http://code.google.com/p/chromium/wiki/UsingGit
 #
 # To test manually, run:
 #   python tools/deps2git/deps2git.py -o .DEPS.git -w <gclientdir>
 # where <gcliendir> is the absolute path to the directory containing the
 # .gclient file (the parent of 'src').
 #
@@ skipping 106 matching lines @@
     Var('chromium_git') + '/external/pywebsocket/src.git' + '@' + 'cb349e87ddb30ff8d1fa1a89be39cec901f4a29c',
 
   'src/third_party/mesa/src':
    Var('chromium_git') + '/chromium/deps/mesa.git' + '@' + '9731cb962963bca8a05f3d0f6ea40c3a781f0537',
 
   'src/third_party/pdfium':
    'https://pdfium.googlesource.com/pdfium.git' + '@' +  Var('pdfium_revision'),
 
   'src/third_party/boringssl/src':
    'https://boringssl.googlesource.com/boringssl.git' + '@' +  Var('boringssl_revision'),
+
+  'src/tools/gyp':
+    Var('chromium_git') + '/external/gyp.git' + '@' + '487c0b6ae8b44932e45347211bca0e8387718436', # from svn revision 1998
 }
 
 
 deps_os = {
   'unix': {
     # Linux, really.
     'src/third_party/lss':
       Var('chromium_git') + '/external/linux-syscall-support/lss.git' + '@' + Var('lss_revision'),
 
     # Note that this is different from Android's freetype repo.
@@ skipping 17 matching lines @@
     'src/third_party/freetype':
        Var('chromium_git') + '/chromium/src/third_party/freetype.git' + '@' + 'a2b9955b49034a51dfbc8bf9f4e9d312149cecac',
   },
   'win': {
     'src/third_party/nss':
         Var('chromium_git') + '/chromium/deps/nss.git' + '@' + Var('nss_revision'),
     'src/third_party/bison':
         Var('chromium_git') + '/chromium/deps/bison.git' + '@' + '083c9a45e4affdd5464ee2b224c2df649c6e26c3',
     'src/third_party/gperf':
         Var('chromium_git') + '/chromium/deps/gperf.git' + '@' + 'd892d79f64f9449770443fb06da49b5a1e5d33c1',
-    'src/tools/gyp':
-        Var('chromium_git') + '/external/gyp.git' + '@' + '487c0b6ae8b44932e45347211bca0e8387718436', # from svn revision 1998
   }
 }
 
 
 include_rules = [
   # Everybody can use some things.
   '+base',
   '+build',
 
   '+testing',
@@ skipping 128 matching lines @@
     # corresponding .py files have already been deleted.
     'name': 'remove_stale_pyc_files',
     'pattern': 'src/tools/.*\\.py',
     'action': [
         'python',
         'src/tools/remove_stale_pyc_files.py',
         'src/tools',
     ],
   },
 ]