Revert "REVERT THIS BEFORE UPDATE ion: Rename heap_mask when used in userspace"

This reverts commit 19a26f839f07f3cfa1d8f4e4c52521c03fb51964.