Merge latest Skia into master (1 commits)

https://skia.googlesource.com/skia.git/+log/7ee385e..13071c5

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