Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are...

Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677 am: 35d1b45b am: dc0f9fa9  -s ours am: 8919cc83  -s ours am: 0241b6d8 am: 0fee65e5 am: 08fed21f  -s ours am: 0029d03c am: afeaced4 am: 2a214fc5 am: 0ec10c8f  -s ours am: 916552b0 am: b5b69a20
am: ac684443  -s ours

Change-Id: If22fe6b47200c45c21851567e53ec6617c227b5f