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

Change-Id: I073418608f360eaf5d639c7df12e6296e6793d07