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

This commit was generated by merge_from_chromium.py.

Change-Id: I1d0dc7cb1c32c67cf27d67f422fbb7a7f755f70b