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

This commit was generated by merge_from_chromium.py.

Change-Id: Ic9e634e90d0fc142bc58bdfcc1a27e4f45b1f9cd