am 90d58b8a: am afa6b8e9: ART: Make elf loading not abort

* commit '90d58b8aece5fd02290e56b60974e738b2595fb8':
  ART: Make elf loading not abort

diff --cc compiler/elf_fixup.cc
Simple merge

diff --cc compiler/elf_patcher.cc
Simple merge

diff --cc dex2oat/dex2oat.cc
Simple merge

diff --cc patchoat/patchoat.cc
Simple merge

diff --cc runtime/elf_file.cc
Simple merge

diff --cc runtime/elf_file.h
Simple merge

diff --cc runtime/oat_file.cc
Simple merge