Merge "Fix <endian.h> and <sys/endian.h>."