Merge "Clean up _BYTE_ORDER definitions for better x86 portability."