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