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

This commit was generated by merge_from_chromium.py.

Change-Id: I8f8430c4580db10f69aa49c53b7bbeefd3362cd8