am baba16a4: Merge "ART: Fix re-throwing failures of non-convention errors"

* commit 'baba16a405df121542b66eba1a025e58850092b4':
  ART: Fix re-throwing failures of non-convention errors