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

Change-Id: Ic2f0ead3778792710e1c7d959423e8639c01f595