adb: Add a few more wait-for commands

 * wait-for-recovery is obvious.
 * wait-for-online will wait for recovery || device

Change-Id: I70f747bcd201a4157b988d7ed49bcc8e5ff4c85f
ifdef for stream fm
Merge branch 'cm-10.1.1' into martincz
Merge remote-tracking branch 'cyanogen/cm-10.1' into cm-10.1
Merge remote-tracking branch 'quarx/cm-10.1' into HEAD
Merge remote-tracking branch 'mokee/jb-mr1_mkt' into HEAD