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

This commit was generated by merge_from_chromium.py.

Change-Id: I81348c7086f5720251fd35576494accc00c8c615