Reland "Add optional signal forwarder and '-z' option to cli" am: dba6209b4f am: 2e3caf3c6e am: 3c4fcf7913
am: 5eab52009f

Change-Id: I7a6ee720cb6563dcad47f04810595ce8cec5bd3c