Fix android livesync

* Fix broken usb livesync
* Fix livesync to old version of companion
* Fix livesync to new version of companion 
(not a merge stopper) the else can be removed.