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

This commit was generated by merge_from_chromium.py.

Change-Id: I177f4eed6f8f875bd05e1ff3445647bc538437bd