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

This commit was generated by merge_from_chromium.py.

Change-Id: I19d1c94a6514e7b153c044c1584b930d7c26ba49