Merge "Separate MemMap from DexFile completely"