Merge "Revert of Temporarily revert just Multiply to see if that's the source of NEON diffs. (patchset #2 id:20001 of https://codereview.chromium.org/1129293005/)" into master-skia

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

Change-Id: I4d7009169a56e193dedfdfabda2e66e4a16c82db