Merge "Deal with ASAN alloc-dealloc mismatch in class transformation code." am: 0b183409d8 am: a95ec49e01 am: 4e2eb430ee
am: 68bc395ca0

Change-Id: I7b67985ef116a42ffd7a18900699069b19eae7f1