util.py: Make android_config_device work for variant devices