Merge "signal_catcher: track tombstoned API changes." am: 8144b1ebea am: cdc584b838
am: d07d8fd44e

Change-Id: Idab6e62a7a8d013af7f51d5699e1bb2a6d0601a3