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

* commit 'd797763ca6a6e092226010675e68c3290d6e67a5':
  Remove strtok from adb.