Merge "ART: Fix GetErrorName." am: b42118ea6a am: b365decfa1
am: bdfb5c2d54

Change-Id: I1c93456b158c90ca7fcbc226d9a6be75dbaf944a