Merge "Deal with ASAN alloc-dealloc mismatch in class transformation code."