Merge "Fix build on host"