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

This commit was generated by merge_from_chromium.py.

Change-Id: I36616486742ab4c073a2b5e3baf84a21d3150b97