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

This commit was generated by merge_from_chromium.py.

Change-Id: Ia62c295881efe0109c78a2b7323b9fed1e5b491c