Merge "Revert "ART: Fix noreturn for Mac""