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

Change-Id: I7bc7e3adbd02438b5e9169edb220a19a9f81d4da