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

Change-Id: Ibd5fb97f2710349e922da376807bbceabe525bb2