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

This commit was generated by merge_from_chromium.py.

Change-Id: I7643530b7ce6de30b1417fe399ba85d0596de127