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

Change-Id: Idbb52ce4c36495ce16d21dd72ad7c3fbf07f155c