Merge "signal_catcher: Only notify tombstoned when we're using it." am: a97772fe0b am: 82b2cd5ead am: 2cf921d114
am: 2737ee9396

Change-Id: Ibe124c29e4ad4d28a7f796745ebb794815842ded