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

Change-Id: I9298a3b5423393705435f92e8f4aeb5806f92714