Merge latest Skia into master (8 commits)

https://skia.googlesource.com/skia.git/+log/fd146aa..3f142b6

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