Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev
am: f78ff48d0d  -s ours

Change-Id: I82e447c8dbbabd40977805bc1d233de832296e6b