Merge "Update byteswap.h from bionic to match endian.h."