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

This commit was generated by merge_from_chromium.py.

Change-Id: I34068db088f7d8e6a98c2b10447b72c1c4825a44