am dc00c73d: Merge "ART: Avoid recursive abort"

* commit 'dc00c73d24a46c8522176fbc539f3e39710807c2':
  ART: Avoid recursive abort