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

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