Tweak hack/make/*-{client,daemon} to be consistent Upstream-commit: dc7664d62e4e758ba1a532dca578f53880faa388 Component: engine