am 25447aec: Merge "Clean up more recursive FORTIFY_SOURCE calls"

* commit '25447aec39c3c3d54b2defab6a5666c162db4f5a':
  Clean up more recursive FORTIFY_SOURCE calls