Close server connect pipes on cleanup

Not nearly as big of a problem as the base client/server pipes
but still probably ought to be cleaned up

Change-Id: Ie4dcf4c623fa5cd9aadae13b335fcdf44c6ecad6
Merge "Close server connect pipes on cleanup"