Merge "Remove CoreTests: HeapTest" am: c3fd3b8c7d am: 19d39ee384 am: 1cfc324de1 am: 2d82836601
am: ad72d319ba

Change-Id: Ic9f783b023b09bd29b392e6aadecc25311499c40