Merge "Remove runtest hard dependency on test_defs.xml files."