Merge "Fix dalvik map names" into lmp-dev