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

Change-Id: I64e9d29bc264c9091d61c96a04b1e428430bd075