am 5dfdb701: Merge "FORTIFY_SOURCE: fix up previous commit"

* commit '5dfdb701292c53e74e319f277d808e598389c8e7':
  FORTIFY_SOURCE: fix up previous commit