Merge "Revert "ART: Fix gtests after try/catch change""