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

This commit was generated by merge_from_chromium.py.

Change-Id: I5193f7b25ab712b948d19d9cda26826c74da5911