Merge "Fix x86_64 check for signal handler."