Merge "Remove CoreTests: HeapTest" am: c3fd3b8c7d
am: 19d39ee384

Change-Id: I7ac73bf032ea640bc65c5c85df75330133255052