Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at 80e01de623edbdfc23bc7c860cccefb4e50e8a7d

This commit was generated by merge_from_chromium.py.

Change-Id: Ida3dd7868a8830898dc552540845c13451e96039