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

Change-Id: Id5a9d152e78009f45a9cdcc916fa4b5ff09da67f