am 4bfaf1e5: Merge "FORTIFY_SOURCE: optimize"

* commit '4bfaf1e5f62748b305406ff4ceebd5f4b750038c':
  FORTIFY_SOURCE: optimize