Merge "Don't use SA_RESTORER if it is not defined"
am: aac0dd9891

Change-Id: I025e86e3c0c0020496baf94588b106eab018a973