Merge "Revert "enable -fstack-protector-strong""