Merge "Don't include <machine/cpu-features.h>."