Merge "Restore errno in signal handlers."
am: f161e00289

Change-Id: If0b02199d99a7ec67613ee819ef284be89f037e4