Wrap 'adb devices' and 'adb wait-for-device'

Removed an extra call to split a string which was causing a
runtime error.