This relands commit a87ba5c86d. Adjust llvm/utils/lit/tests/googletest-timeout.py for new test output.
a87ba5c86d