Merge "Revert^2: "ART: Restrict some checks in the verifier to P+""
am: e9c1634d98

Change-Id: Idad339cdf73f1e81ad3a4a851b1518851ec7f35c