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

Change-Id: If2ac2ed3bbac4419ab9e7d5bac6b160f0162f846