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

This commit was generated by merge_from_chromium.py.

Change-Id: I8b5f4dd2de50dffc263b249084c9be12e5a85e29