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: f78ff48d  -s ours am: 7cd16688 am: a5e128ba
am: 94c08c2b  -s ours

Change-Id: I92cf4d41b8adae4021b9a2eaf99f56015c995148