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

Change-Id: I18ae48fab870f5b16ed366641179e87e839205e8