Merge "ART: Correctly handle temporary classes in class-load events (3/3)" am: ebf4d99fd4
am: fffe7702e9

Change-Id: Ia914af5ffe2604a50b3e29e61cb6c787fdc3faf7