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

Change-Id: If9a442d49b90a301fe03e3727944f589d02d811a