Merge "Fix regression in Dalvik:HEAP_TOTAL" am: deb35fb00b
am: 4d65d3cbac

Change-Id: I7e370c252f14988d60711c1fa777832825d54d48