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

Change-Id: I2e790e95077c0760d1be6d984e7e90fb62a3d9db