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

This commit was generated by merge_from_chromium.py.

Change-Id: Icf1d2b6edb94073be5324995d265507a1a2e3967