Merge latest Skia into master (1 commits)

https://skia.googlesource.com/skia.git/+log/8bbdd49..7a6c9f7

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