x86: merge byteorder_32/64.h