Merge "ART: Modify --abort-on-hard-verifier-error"
am: 60c29e42c2

Change-Id: Ia25fe682270e5ef881ddedae8fb828f9f4a6ef9a