am 4140d90c: am 3acc908c: Merge "FORTIFY_SOURCE: fortify strchr"

* commit '4140d90c60e0a9b5b2f1b8ad3d17e169f7288ae9':
  FORTIFY_SOURCE: fortify strchr