Merge "ART: Add abort-on-soft-verifier-error"