am 20ffc875: (-s ours) Merge "ART: Make elf loading not abort"

* commit '20ffc8757277dac7fd7a74e576c6185ae1292285':
  ART: Make elf loading not abort