Merge "Exclude NEON files for ARMs that do not have it"