[automerger skipped] Fix some clatd cloexec and file descriptor leaking via missing close()
am: 35d9175db9 -s ours
am skip reason: change_id Iceb7d4052dc9be29db5c7bb3fe2ee27da7864379 with SHA1 60bce378cf is in history

Change-Id: Ife02c34c2a625aa9d0fcdeaf3e50a4dc6b92ac84