Merge "<android-base/endian.h>: fix interoperability issue"