am 4b5a0e1a: am 693bd73f: Merge "Remove 32-bit assumptions from the ELF code."

* commit '4b5a0e1ad76d76d6a8793f61e3c0902ea4628ce7':
  Remove 32-bit assumptions from the ELF code.