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

Change-Id: I2c11ebe1f010383f22cdecf50589bb28c21b793c