Merge "scrypt doesn't need <machine/cpu-features.h>."