Merge "Update byteswap.h from bionic to match endian.h." am: b6d57640cc
am: 8811e5bdda

* commit '8811e5bdda5e188d3e63c3a36b643164c4b4c2ba':
  Update byteswap.h from bionic to match endian.h.