Fix buildsteps for non-neon builds