Merge "Prevent deadlock calling transformation functions in ClassLoad callback." am: dc83dea435
am: cf6085378a

Change-Id: Ib8f204ab79c6cb29d4c3d0b812e02292af5be5d1