envsetup: Make installboot work in recovery mode too

 * Needs a change to adb to allow waiting for recovery

Change-Id: Ia90645513f46bcb5f20b7c74c55ef15842710d3d
Merge remote-tracking branch 'cm/cm-10.1' into HEAD