Merge "Rearrange the way SignalCatcher writes logs."