am cfd9d9c7: Merge "applypatch: Refactor strtok()."

* commit 'cfd9d9c7ce03b847946977a98efcbfca2f067fd3':
  applypatch: Refactor strtok().