Merge "ion-unit-tests: Add system heap presence test" am: 9bcec87086
am: 4420b6306c

Change-Id: Ia07f293759249f798cbf5f7f8bb8e36612d9dc91