Merge "Add -mfpu=neon-vfpv4 if cpu is krait"