am 56be31b3: am 97c1a658: Merge "ART: Fix possible soft+hard failure in verifier"

* commit '56be31b328b908c8ddedda95fe2fcff0dd1f108a':
  ART: Fix possible soft+hard failure in verifier