am 98815e31: Merge "Fix x86 endian.h"

* commit '98815e312404638a2ced6683ee0e80769b695273':
  Fix x86 endian.h