am 5040636a: (-s ours) am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()."

* commit '5040636abd451e4e45227493f328f1cda39a5177':