Merge "Bring our <machine/endian.h> files back in sync."