Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at 7611a86a9a6fb34d0aaa9eeaa10a17d5cdf4d62b

This commit was generated by merge_from_chromium.py.

Change-Id: I3933f55c2b17d1b4684dfcbbd143c30ef15669b0