Merge "Use HashMap for DexFileVerifier" am: 3dca4c0417
am: 25b9d6f97b

* commit '25b9d6f97b312e03fcd7baa6df9de2e8d7011f0a':
  Use HashMap for DexFileVerifier