Merge "adb host: add device state in "adb wait-for-*""