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

This commit was generated by merge_from_chromium.py.

Change-Id: I78ae1d6afbb6131b0087ba7456c6ec684d931dd7