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

This commit was generated by merge_from_chromium.py.

Change-Id: Iadfbdaa7b26f09d60a36d4be4ba7ced8e6dd67c3