Cleanup after test suite split.

Bug: 238141698
Bug: 261478099
Test: presubmit
Change-Id: I3d99829a735bc09b52ef77d75d875ca547d53f01
Merged-In: I3d99829a735bc09b52ef77d75d875ca547d53f01
2 files changed