Merge "Fix x86 endian.h"