util.py: Correct the command to connect_device
aosp-stable: Speed up the userdata erasion