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

This commit was generated by merge_from_chromium.py.

Change-Id: Ib24503ae3a326c7c450e9d8ad9088d8df05a0e30