[automerger skipped] Merge "Fix regression in Dalvik:HEAP_TOTAL" am: deb35fb00b am: 4d65d3cbac
am: d8c3bf5bb2 -s ours
am skip reason: change_id Idc5ad13d4e158659009290f410ce721013345308 with SHA1 07aab083cb is in history

Change-Id: Ib481454e6d27834b4c4126cd83cc5dc23e0b067a