Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am: f78ff48d0d  -s ours am: 7cd1668893 am: a5e128ba97 am: 94c08c2bed  -s ours am: d4fe288933
am: f65661939b

Change-Id: I05d4bdc92834197058c77ae31113c9783b558d8e