Merge "tombstoned: fix another call to evconnlistener_new." am: baea76dba7 am: 6d0d6c34cd
am: 5d0e0fbdbb

Change-Id: Iccc34fef36be06df302706a65fdf99bebb1dcaad