Generalise the adb device check commands

[a-t-0]

• Replace the check for device id from file for a direct command from either fastboot or adb.
• Ensure the device id check via adb allows for different lengths of device ids.
• Ensure the device id check via fastboot allows for different lengths of device ids.