Merge "Make sigaction consistent about SA_RESTORER and sa_restorer" am: fe44c3cde0
am: 1724eb28d9

Change-Id: I48dd5eb6fec0320250f20ac331b09bd16473e075