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
Change-Id: Ib333fdba81a5c339bc9b55fa3055a73a3b6042a7