Merge third_party/skia/gyp from https://chromium.googlesource.com/external/skia/gyp.git at 5f1dd37aad2652c27f6734175ff0c2870c9226eb

This commit was generated by merge_from_chromium.py.

Change-Id: Ifff1fbc3c69867573de2502db3b66094a291ebe3