Add optional signal forwarder and '-z' option to cli am: 74b902788f
am: 2007be50c6

Change-Id: I32ae59d81cc057466b267f643db972aa07ac8f4b