Merge "ART: Mac build fix"