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

This commit was generated by merge_from_chromium.py.

Change-Id: Ic4560992b07c897e9b116a8d5adf6c27f76d60e3