Merge "Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING" am: d269f30d62 am: f62b12ae31 am: 540bc2d94e
am: 3201b52bd5

Change-Id: I7e2f8da8b8b23cb9f567e3ec384120a1ac4b3c07