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-mr1-dev am: 5d50d79f am: 5c880142 am: 1fc2d0b1  -s ours am: 2dcc64f6 am: d677e8d413 am: abc6ebd6 am: 05cd9942d9  -s ours am: 34cdf165 am: b2bc7e7e am: 3d8a007b
am: 4a1b8d7aba

Change-Id: I5fa0202b264c224a155b89167cf7a1e3928854c6