am db79e827: Merge "FORTIFY_SOURCE: fortify strrchr"

* commit 'db79e827ebcb077ebaa6d6c96915c5bffba9a0ca':
  FORTIFY_SOURCE: fortify strrchr