Merge "ART: Correctly handle temporary classes in class-load events (4/3)" am: 1f38f99e3e
am: b650571681

Change-Id: I85863269877c1066c07c5d4e0203b46221f33f5c