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

* commit '1e40ace49e25ee4c469ed4613fe09656d3c0a5d7':
  Drop magic number in strrchr and strchr