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