Merge "Use as much of the macOS endian support as we can." am: e5abcddf4e
am: 8959efff68

Change-Id: Idff3c481a46202335fdb9f21564dd2f348bfbf8b