Merge latest Skia into master (2 commits)

https://skia.googlesource.com/skia.git/+log/58abc9e..d46697a

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