Merge "Move Heap::GetInstances to use Handles" am: 4c91f05a9a
am: 7c01c29e32

Change-Id: If38a8bc5fdb71cf6124550c6a098e8fbed755cbe