Merge "Remove strtok from adb."