Merge "Fix fortify compilation test in x86_64."