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