am 2fdf9cd2: Merge "Fix corruption when neon is disabled." into jb-mr2-dev

* commit '2fdf9cd285374c54a12744f24d7aca97be7e4326':
  Fix corruption when neon is disabled.