Merge changes I1042e87f,I58b17ecf

* changes:
  Remove remaining uses of DexFile::GetChecksum.
  Improve checking of multidex dex checksums.