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

This commit was generated by merge_from_chromium.py.

Change-Id: I520587e2ceeb6004a157be0e5a4190a10b08749f