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

This commit was generated by merge_from_chromium.py.

Change-Id: I639cb9a4bd0ee5323c918eff5de321403bab6fbb