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

This commit was generated by merge_from_chromium.py.

Change-Id: I23a5bcadad15d5f2b3e8780f467e275a020293c5