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

This commit was generated by merge_from_chromium.py.

Change-Id: Ifc955838049c6dca58a472046a37894cd0fd6e0d