Merge "Fix the stack-protector test for x86/x86-64."