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

* commit 'c16247127541af1eb73da28b55b1a41202fa1f56':
  Clean up more recursive FORTIFY_SOURCE calls