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

* commit 'e0e5b2f6e731c639107e29abec17db2e6eb498e8':
  Fix builds where _FORTIFY_SOURCE is off.