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

This commit was generated by merge_from_chromium.py.

Change-Id: I56c9cfe224c13077ee77dadae1ea3df868d798b6