FORTIFY_SOURCE: fix up previous commit

I forgot two files in 326ea5413d18ea019cd1bda415ce428f7bdcafd2.

Change-Id: I30430f65bfafad4274193fc5b973959eac0791a7