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

This commit was generated by merge_from_chromium.py.

Change-Id: Ide13800347ff3790abe692dc84e71b17656a7a56