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

This commit was generated by merge_from_chromium.py.

Change-Id: Ic09e63f598d33e8ee274ef59d74b4d1d56c14035