Merge third_party/skia/src from https://chromium.googlesource.com/external/skia/src.git at 4686412c23ba429419972f8017588b5add55fdc9

This commit was generated by merge_from_chromium.py.

Change-Id: Ifeac5e7f72112505f92f3745f0eb76d15197dca1