Merge "Include <byteswap.h> on Android." am: a56b371c82
am: c1567549d0

Change-Id: I49024d6257f23d17b7a5f8d362abd189f20ecc60