Merge "tombstoned: Fix calls to evconnlistener_new." am: e997ba9d22
am: 17785d2030

Change-Id: I6193a241c5ed48064e1d22f84c4c47457e0e1c5c