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

Change-Id: I92cf4d41b8adae4021b9a2eaf99f56015c995148