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

Change-Id: I993cccb6a972ee1815e0af36b15f2ec95fa6e7a7