am 027a8fae: am 8539961f: Merge "FORTIFY_SOURCE: strcat / strncat optimize"

* commit '027a8fae7750855af2ec0f8dd655e4a48ebf9352':
  FORTIFY_SOURCE: strcat / strncat optimize