Merge "ART: Fix potential deadlock in class-load events"