Merge third_party/skia from https://chromium.googlesource.com/skia.git at 2e74f758f8379338f75898f28128ade1dfcf3702

This commit was generated by merge_from_chromium.py.

Change-Id: I90e2592d15e8830e9081052b7bd9ccacd9fc6f6f