Merge "ART: Follow-up changes to DexFileVerifier"
am: 8bf3b263d3

Change-Id: I26030cec06d628905061d17a64a7cd9e7ac3f2b5