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

This commit was generated by merge_from_chromium.py.

Change-Id: I9058fd8bc7cc9b9f879ef2b36ff85c3efaf15801