am 36c5ae7a: am 40f65560: Merge "ART: Fix 64-bit ELF file support"

* commit '36c5ae7a47237dd7ee994ee6c61e3b8f141b2bee':
  ART: Fix 64-bit ELF file support