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

This commit was generated by merge_from_chromium.py.

Change-Id: Ia5b5347718dc94b867a38b1ee5852a9647a6f46d