Revert "HACK: ion: Use heap_id_mask in userspace"

This reverts commit e39f03392918c697c129adb5178060dc5bd9b281.

Change-Id: If63b15e3c7deef3118aeb27399e41f2089664e6a