Merge third_party/skia/gyp from https://chromium.googlesource.com/external/skia/gyp.git at 8ecee3cd6742fa45e097e49fae4bb55d398b706d

This commit was generated by merge_from_chromium.py.

Change-Id: I5d485302d3acb3288dbbedfbcd742f321a8d7b83