Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 27b3d578b9 -s ours am: 57fdbb97a6 am: 2cf025f976 am: 9c7ac98157 -s ours am: 1448a693d8 am: 3d4c737736 am: f6d8037708 am: 90eafb5322 -s ours am: b2a1dcb913 am: 6ffdf43ec3 am: 5fc21fdbcc am: b2e88d0cb9" into nyc-mr1-dev-plus-aosp
am: 5b396853fb -s ours
Change-Id: Ifeadce2529ac49fafb1a1f877b9c3e3cbbd75389
This commit is contained in: