Merge latest Skia into master (3 commits)

https://skia.googlesource.com/skia.git/+log/0831f1b..874a872

Test: Presubmit checks will test this change.
Change-Id: I72ab252fe17218f7841c79dc1c50a201ec1d34f9