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

* commit 'f075f9a17ab01fa13a651c675aed2837a8bf3191':