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

This commit was generated by merge_from_chromium.py.

Change-Id: Ic84067510ccabd72f82dc2be19f90e24e8aaaddf