Merge tools/gyp from https://chromium.googlesource.com/external/gyp.git at 7614842ca70d1cca6192166b10c0565f9aee358a

This commit was generated by merge_from_chromium.py.

Change-Id: Id0090d2a9365f3facc8200442ad55332c1ca7757