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

This commit was generated by merge_from_chromium.py.

Change-Id: Ied3508b397b53601b684b53776fe946044a20e3e