Merge third_party/skia/src from https://chromium.googlesource.com/a/external/skia/src.git at eb8698b339a00a3c1ed94f70d163e9d201b331d9

This commit was generated by merge_from_chromium.py.

Change-Id: If7f25687daab6821deb92dc1c5a765dc5d9ec35a