Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at 6760f5b1a4852fd6ccbe4ffc409d73edac445744

This commit was generated by merge_from_chromium.py.

Change-Id: I89d5410386f4fcadf1e51460560ef91b7379e1db