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

This commit was generated by merge_from_chromium.py.

Change-Id: Idc71e7beb4806782b026623e1943a310d197809e