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

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