Merge "Move the meat of <features.h> into <sys/cdefs.h>."