Merge "Use HashMap for DexFileVerifier"
am: 3dca4c0417

* commit '3dca4c04170bb4c7b26609e55f3f4966d46b681a':
  Use HashMap for DexFileVerifier