Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at 1ff523f4eccd38fb9f73e60dddd895736ce90346

This commit was generated by merge_from_chromium.py.

Change-Id: I09db4caa53f4e9192c3638f21faf7d5aedef59ab