aosp.py: Move connect_device to after repo type identification