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

This commit was generated by merge_from_chromium.py.

Change-Id: I1997dd3e9b1ec70f8b9cf596ec74cdf63c72002f