Merge "Fix build on non-neon targets."
am: de104595f3

* commit 'de104595f3b2001658b50278725d2a7491d724a6':
  Fix build on non-neon targets.