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

Change-Id: I0c68cf07a9de085dce8b13ff09c622abbeb3e597