Merge "ART: Add abort-on-soft-verifier-error"
am: 2f707787e6

Change-Id: Ib2350aa24b4bd253e4f16366c898453e1a95fed9