Merge "Temporarily revert just Multiply to see if that's the source of NEON diffs." into master-skia

https://skia.googlesource.com/skia/+/5b9f352ff1e245dd48e200f8f8b683f4569547d3

Change-Id: Ic5c4bb31d869749b36e34227c9c17672252ab498