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

This commit was generated by merge_from_chromium.py.

Change-Id: I1e9935bfeb9d392894f75696d78d9d229f9e7106