Fix mac build and signal test

Change-Id: I58311285db9095ca6339ce29a9f15e841b7c822d
4 files changed