Merge "Properly fix heap_tagging_helper for HWASan."