Merge "FORTIFY_SOURCE: fix up previous commit"