Merge "Fix dynamic resampling for non-NEON devices"