Merge "Revert "Revert "ART: Implement try/catch blocks in Builder"""