Fix two codegen issues.

This fixes a missing shebang in generated CLIs and missing imports in the
generated client file.