Merge "Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING" am: d269f30d62
am: f62b12ae31

Change-Id: I002c55618a647e4ab17fff50f89b04df3e492e9e