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

This commit was generated by merge_from_chromium.py.

Change-Id: I2e21eef40232caa1e388149af83cfb86ae4f6ca8