am fb87d201: Merge "64bit fixes for elf file."

* commit 'fb87d2014cb86e301d769e4af34456331621ec5b':
  64bit fixes for elf file.