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
Change-Id: I92cf4d41b8adae4021b9a2eaf99f56015c995148