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

Change-Id: If5414a6104b4a3f52019da3169d871f700d09a61