Merge "Fix index checks for error strings in DexFileVerifier."