Fix some clatd cloexec and file descriptor leaking via missing close() am: 60bce378cf
am: a743270aeb

Change-Id: Ie9cb51aa027b8c3425dff5bff6d89de383de508b