Merge "remove slower scalar code in favor of vectors" into master-skia

https://skia.googlesource.com/skia/+/c08330f1601aeca7f10aeb2194118decbfbf83e1

Change-Id: I4c250911fc6a0282aa94f147199f038cb2360113