Merge "Revert "ART: Restrict some checks in the verifier to P+""
am: 1c807529dd

Change-Id: Ied61e5b9b72babeccc8bbecb5e75834171585357