Rebase Dalvik Heap based on CM

Change-Id: Ic784787e6ed2dc2ab7ff836d810e59ec25f06ffd