Merge "Remove CoreTests: HeapTest"
am: c3fd3b8c7d

Change-Id: If6565f8bc8a655d3d7422f57db3dd6160459b092