Merge latest Skia into master (4 commits)

https://skia.googlesource.com/skia.git/+log/9f4b0ae..5fa3d6d

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