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

Change-Id: I5d9b418c6f4d39346eaaab7fb0eae8d5667ac5a5