Merge "Fix <sys/endian.h> uint32_t build failures."