Merge "signal_catcher: track tombstoned API changes."