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

This commit was generated by merge_from_chromium.py.

Change-Id: Ibacda83beb7fba92876641b9d9c60e9912713736