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

This commit was generated by merge_from_chromium.py.

Change-Id: I1160fd1bab5c043d7ec5855bf01ee5d3ddc4d7da