Merge "Revert "ART: Fix mac build"" into lmp-dev