Merge latest Skia into master (3 commits)

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

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