Merge "adb: support wait-for- with multiple states."