Merge "ART: Correctly handle temporary classes in class-load events (2/3)" am: e27abfa9fa
am: 0af46a7029

Change-Id: I1b4aa95f2be43b95b9b29a50da8aa1b23356ec19