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: d883b565 am: e7b2c9b3
am: 0487464b69

Change-Id: I9e6db05f433329af45f21241216c753d6ac212a3