Merge "Fix more endian.h issues"