Merge changes Ibc8038b1,I1876ecd7,I57d70f8b
am: 3e0eaa4

* commit '3e0eaa4103f4497463dd8b5daa1ee7ffe3921211':
  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.

Change-Id: Ib54818926966cf01839b98a5ef772c3a3900fd38