am 2c18b956: Merge "ART: Avoid obvious segfault in arm & x86 fault handler"

* commit '2c18b956e9b501cc21af6c1a1c20baba2f635a32':
  ART: Avoid obvious segfault in arm & x86 fault handler