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

This commit was generated by merge_from_chromium.py.

Change-Id: I62c1fed116abfbf9885fe9767ebe5c9a1d4e9e9c