Merge "rename heap_mask -> heap_id_mask"