am 0a0c2321: am 4bfaf1e5: Merge "FORTIFY_SOURCE: optimize"

* commit '0a0c23216766adf76739dc38dcb45934105cd41c':
  FORTIFY_SOURCE: optimize