am 4b81659e: Merge "Remove strtok from adb."

* commit '4b81659ed2c0dd71c123301238c35b1e825e5b7a':
  Remove strtok from adb.