Merge "Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am: f78ff48d  -s ours am: 7cd16688 am: a5e128ba am: 94c08c2b  -s ours am: d4fe2889 am: f6566193 am: 630d5773 am: c9830d56  -s ours am: c5442c26 am: 7b348ecc" into nyc-mr1-dev-plus-aosp
am: 0cc5cc4e  -s ours

Change-Id: I2805104c0bf2a19d874167fb4157b377f9ec3f72