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

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