Merge latest Skia into master (4 commits)

https://skia.googlesource.com/skia.git/+log/3a97054..a950a86

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