Clean up client binary dependencies Upstream-commit: bf6eb855391e166a65db284567686fafbe4a9a0a Component: engine