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

This commit was generated by merge_from_chromium.py.

Change-Id: I52ec8f577a9b64496a39bdf9a197e7c527f9356a