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

Change-Id: I939008cb6b770c4273e258d91e2916a1823ec6fb