[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed
am: 786e2694b1

Change-Id: Ia40c3fc57b5c17910c67faf40b940bdd944dd4e3