Catapult autoroller is stuck again :(

It's started failing on:
https://chromium-review.googlesource.com/c/610519

With the error:

Traceback (most recent call last):
  File "/b/swarming/w/ir/build/android/test_runner.py", line 34, in <module>
    from devil.utils import run_tests_helper
  File
"/b/swarming/w/ir/third_party/catapult/devil/devil/utils/run_tests_helper.py",
line 10, in <module>
    from devil.utils import logging_common
ImportError: cannot import name logging_common

From the error I suspected and reverted John's CL
https://codereview.chromium.org/2972253002

However the next roll after the revert is still failing:
https://chromium-review.googlesource.com/c/612120

Now with the error:

E   19.687s list_tests(00440078d9384278)  Shard failed: list_tests(00440078d9384278)
Traceback (most recent call last):
  File "/b/swarming/w/ir/build/android/pylib/local/device/local_device_environment.py", line 59, in wrapper
    return f(dev, *args, **kwargs)
  File "/b/swarming/w/ir/build/android/pylib/local/device/local_device_gtest_run.py", line 370, in list_tests
    device=dev)
  File "/b/swarming/w/ir/third_party/catapult/devil/devil/android/crash_handler.py", line 32, in RetryOnSystemCrash
    return f(device)
  File "/b/swarming/w/ir/build/android/pylib/local/device/local_device_gtest_run.py", line 369, in <lambda>
    None, d, flags='--gtest_list_tests', timeout=30),
  File "/b/swarming/w/ir/build/android/pylib/local/device/local_device_gtest_run.py", line 185, in Run
    stdout_file.name, device.StatPath(stdout_file.name).get('st_size', 0))
  File "/b/swarming/w/ir/third_party/catapult/devil/devil/android/device_utils.py", line 1934, in StatPath
    'Cannot find file or directory: %r' % device_path, str(self))
CommandFailedError: (device: 00440078d9384278) Cannot find file or directory: '/sdcard/temp_file-296e48a5c909a.gtest_out'

Nothing in the CL range looks particularly suspicious to me:
https://chromium.googlesource.com/external/github.com/catapult-project/catapult.git/+log/0eeb5baed7a4..f9ea41b51d8f