Merge "ART: Fix mac build"