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

* commit '693bd73fcdf1504e84aef314d1933f5efc2c817d':
  Remove 32-bit assumptions from the ELF code.