[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 85bc33a8f4 am: 46442d1be1 am: 8be4dc7e16  -s ours
am: c56c079470

Change-Id: Ie03995ef39bce15b5279ff78ef23e94401eab9db