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