Merge "Enable stack-protector for x86"