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

This commit was generated by merge_from_chromium.py.

Change-Id: Iaa89bafef268db11eb5d23016e3e62fe7924b4d8