Revert "rename heap_mask -> heap_id_mask"

This reverts commit 7afcf8ab314913e4092b366e8858393ef910249b.

Change-Id: Id9507d14496056532bbd57cb1e4afcd36fb34ce8
Merge "Revert "rename heap_mask -> heap_id_mask"" into du44