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

Change-Id: Ie0629a3b6f4c5fd8166bb060673606878f00bef8