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 lmp-dev am: 9e0f36e4  -s ours am: be7a220d am: 7a835be4 am: 0ba75416  -s ours am: 2143e011 am: f65661939b am: 771f58c5 am: c9830d56e5  -s ours am: bcdcd18f am: 0ab51b1d
am: 7bdcf312  -s ours

Change-Id: I7db8155fd02f352c8a635f88d96877f15eb2f6d4