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