Merge "Add new memchr/strrchr tests."