am 890ef765: am 025b8203: am 443c7647: am a061388d: Merge "Fix dalvik map names" into lmp-dev
am 890ef765: am 025b8203: am 443c7647: am a061388d: Merge "Fix dalvik map names" into lmp-dev

* commit '890ef76560d34e325b82e1bf72336de8de838844':
  Fix dalvik map names

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base