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