Merge "Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING" into oc-dev
am: bfd70fb90b

Change-Id: I9b8f53db81339493d44a29aa711940a5f0142b67