Merge latest Skia into master (3 commits)

https://skia.googlesource.com/skia.git/+log/652ecb5..a7d61a6

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