Merge latest Skia into master (2 commits)

https://skia.googlesource.com/skia.git/+log/e14349a..d1fe952

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