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

This commit was generated by merge_from_chromium.py.

Change-Id: I9606109a4d006ba08a96c01cc73f2291b2d7389e