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

Change-Id: Ibb9428212a374a9e7050fcb4358dd896604d2982