am 8c389e9c: Merge "Stop using adb_strtok, and check argument validity."

* commit '8c389e9c769c8632cf16c0794f1e84f49996077c':
  Stop using adb_strtok, and check argument validity.