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

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