Merge "Separate MemMap from DexFile completely"
am: aabc5e63fb

Change-Id: Ib94b55915fc3f09166bc0c85dbbb6ab5675c1ef8