Merge "Fix corruption when neon is disabled." into jb-mr2-dev