Merge "Deal with ASAN alloc-dealloc mismatch in class transformation code."
am: 0b183409d8

Change-Id: I22825c0859e6394acd09fa567b6fe83335338804