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

Change-Id: I273126dfb3245c4ee7352f8021b0537a03275f5b