Merge "Allow running unittest.TestCase via run_tests.py"