Merge "Delete More Old CTS Test Runner Files"