am d99f91a0: am dc00c73d: Merge "ART: Avoid recursive abort"

* commit 'd99f91a005b292e4a36535522ba44194c039e767':
  ART: Avoid recursive abort