Merge "halloc: Cast the offsetof macro to ptrdiff_t before negating"