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

Change-Id: I34c307004f2bf804aa000da33ecea9f4bd563c09