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

This commit was generated by merge_from_chromium.py.

Change-Id: I2803e03a972897e3a400528e1a6b85d65331ae57