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

Change-Id: Ia0a0252bc6d4d570ef5d00a14158b437425dde7f