Revert "Add optional signal forwarder and '-z' option to cli" am: 7151582f0b am: 4aa196e11a am: 9e1a385208
am: dd866df333

Change-Id: I28827158861291af75574c5ec92fca46ac9284c5