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

This commit was generated by merge_from_chromium.py.

Change-Id: Ibdf3fde746460ab836c0bd2605b1cee7fa368843