Merge "ART: Follow-up changes to DexFileVerifier"