envsetup: Use wait-for-online so these cmds work in recovery

Change-Id: I7a85e7068f373b1d726aa6b27a51862fa9b7c6fd
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2