Merge "ART: Fix Mac build" into nyc-dev