Merge "gralloc: Fix heap_id_mask"