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

This commit was generated by merge_from_chromium.py.

Change-Id: I0458019a7c76d906f2fee772cbd3d01ff83bd18c