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

This commit was generated by merge_from_chromium.py.

Change-Id: I27cd711a7aa2e2296d0617767355a44af44202db