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

Change-Id: Ie34765f501d780285449d792c3ebee31090a2651