[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed...
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694 am: 8fd324c3
am: 438cc52c -s ours
Change-Id: Iabaa5642ffa6c3417b5e027e2da9b33666b1aacf