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

This commit was generated by merge_from_chromium.py.

Change-Id: I8a56bfe3821cdfe914e9fc747d5577254ee59bdf