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

This commit was generated by merge_from_chromium.py.

Change-Id: I136358b5cfa2079285e5a2d60400148df5e3d88b