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

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