Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at 9202573e476f9f61341aec21b585cdc984141916

This commit was generated by merge_from_chromium.py.

Change-Id: Ie18d76c8733096d38644cab37dc5c9ef7a727e61