Merge "Remove useless non-neon support." into main