Merge "Reconcile assembly-only macros in <machine/cpu-features.h>"