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

Change-Id: Idf9e38f131e9eebc1be87e3697f4701aa30e4025