am 443c7647: am a061388d: Merge "Fix dalvik map names" into lmp-dev

* commit '443c76479684c6aecf132b415aa7052c6bd9d174':
  Fix dalvik map names