Merge "Fix the stack protector death test."