Merge "ART: Fix potential deadlock in class-load events" am: 60d79d2b02
am: 0e609a67c7

Change-Id: Ic4676b4acf4ab35feccf1af5f61cbc5a5eb08e05