Merge "Stop using adb_strtok, and check argument validity."