ION: match AOSP changes in L5 for heap_mask