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

* commit 'b4819b46870cbfd7dec31f2d989f5387bdbae376':
  Use HashMap for DexFileVerifier