[automerger skipped] Merge "Prevent deadlock calling transformation functions in ClassLoad callback." into pi-dev
am: 47b6ace4d7  -s ours

Change-Id: Ib768433e382927488d904aa2fc92dd06f9025d7c