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

This commit was generated by merge_from_chromium.py.

Change-Id: I61bcf20884cb1e62a8ae8422e017871adac367c4