Merge latest Skia into master (35 commits)

https://skia.googlesource.com/skia.git/+log/d1fe952..a309109

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