Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am: f78ff48d0d  -s ours am: 7cd1668893 am: a5e128ba97 am: 94c08c2bed  -s ours am: d4fe288933 am: f65661939b am: 630d577349
am: c9830d56e5  -s ours

Change-Id: Iaae899eeea3c9c95ebcd7654e6fb5a89d7f1ed90