Merge latest Skia into master (6 commits)

https://skia.googlesource.com/skia.git/+log/52b346e..f87e2b9

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