Merge "ion-unit-tests: Add heap id verification test."
am: 32017407fd

Change-Id: Idcffce9f034c06de7f5e5b3ff984ad0663df2826