Merge changes Ibc8038b1,I1876ecd7,I57d70f8b

* changes:
  adb: after `adb root`, wait for the device in any state.
  adb: add support for 'wait-for-any'.
  adb: make 'wait-for-{recovery,sideload,bootloader} work.