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

This commit was generated by merge_from_chromium.py.

Change-Id: I677dc68b5abc7a4a0eaf7a61e35dc83d4902b4bd