Merge "applypatch: Refactor strtok()."