Merge "ART: Host timeout Mac build fix."