Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at 0ff4e1aa19641cda58e3ed98399e0d96e6ccd7c2

This commit was generated by merge_from_chromium.py.

Change-Id: I5cbee9e1d503218e58da79bf5bb37ccb08cbc750