Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am: 447ac4b31d
am: 4431d6cb5b

Change-Id: Ieeff1ea88cfef281c3ebf42312261a601c18e59d