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

* commit '26c815c489197259e3692d4a1e35463989f7c7a3':
  Drop magic number in strrchr and strchr