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

Change-Id: I097461b8771b7df6c2c368789a2f6684bd3fe828