Merge third_party/skia/gyp from https://chromium.googlesource.com/external/skia/gyp.git at f667723f887d8465d4d4b87ec8b412bdf456ce13

This commit was generated by merge_from_chromium.py.

Change-Id: I41938f80f056b4d26bffdc1297cdffe2a173ac41