More fallbacks to adb and don't error out on adb rm failure