am 3acc908c: Merge "FORTIFY_SOURCE: fortify strchr"

* commit '3acc908c79aa9cba975861fa23fa2672733b5d5d':
  FORTIFY_SOURCE: fortify strchr