Merge changes Iac3db17f,I4221ef81

* changes:
  ART: Fix stack trace location reporting
  ART: Rewrite test 911 stack trace reporting