Merge "64bit cleanliness for the dex file verifier."