Merge "build: Fix mac build"