Merge "ART: Clear any exception after resolution" am: 3a4f5f3393
am: b66526a39a

Change-Id: I1e7e7e028b55b297c68be4523bf3c89f7a2ef5a9