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

Change-Id: I2830356fd9288feef334e19a1281c720c6fd7fca