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

* commit '1dc71bec8d3dc3c1eb7eb40aed2eeb04b47f75ce':
  applypatch: Refactor strtok().