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

Change-Id: Ie26a56cd0ab5f42ce47a42a28fe4cf1a91569c0a