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

This commit was generated by merge_from_chromium.py.

Change-Id: Ib4056146058977e349f4127c6f7757e07054d759