Merge "ART: Enable inlining under try/catch"