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

Change-Id: Ifcb92ea2c4a9e6163ff64a31276f3db6140954c8