Merge "Revert "Retire GCC FORTIFY.""