Merge third_party/skia/gyp from https://chromium.googlesource.com/a/external/skia/gyp.git at 4558d6c52772c6ef6638a45a6bd9fb852a01148b

This commit was generated by merge_from_chromium.py.

Change-Id: If1cf9ef466b9e92005ab4ee2dac04d92a16cb4f4