Merge changes I8d333ea5,Ie4efc8bb

* changes:
  ART: Make gAborting an atomic
  ART: Refactor abort code