am a596aa6a: am 26c815c4: Merge "Drop magic number in strrchr and strchr"

* commit 'a596aa6abfdd8ecdb4bcdd9bcad24a19adcf7525':
  Drop magic number in strrchr and strchr