am 65163750: am c37dd599: Merge "Fix builds where _FORTIFY_SOURCE is off."

* commit '65163750b11c814d6a75940ab1ede1e907b14d81':
  Fix builds where _FORTIFY_SOURCE is off.