Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are...

Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 20d3b1f4  -s ours am: 3b193a23 am: a2497472 am: 04c877be  -s ours am: eac11939 am: 3d4c737736 am: 98af576c am: 90eafb5322  -s ours am: c9f07a5c am: 2cd7b9f9" into nyc-mr1-dev-plus-aosp
am: 5831fdcd  -s ours

Change-Id: I3932557b26e44b79646920641e3b1c6b77123170