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

This commit was generated by merge_from_chromium.py.

Change-Id: I9c80f120039651afdb236e38708b0e329437ab89