Merge "Remove the unnecessary generic-neon code."