Merge "Fix more endian.h issues"
am: 19b68a66e5

Change-Id: I3b28b9ed60472c8dccac50eefd0a1a1c038714c1