Merge "ART: Correctly report error loading agents"
am: baf187896c

Change-Id: I99e1e09c303317b251ce93bc5b8befa2934acfa0