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