Merge "Make API lint warnings errors for system & testapi"
diff --git a/java/droiddoc.go b/java/droiddoc.go
index 55bc041..8b66dbf 100644
--- a/java/droiddoc.go
+++ b/java/droiddoc.go
@@ -1412,9 +1412,7 @@
 
 		// TODO(b/154317059): Clean up this whitelist by baselining and/or checking in last-released.
 		if d.Name() != "android.car-system-stubs-docs" &&
-			d.Name() != "android.car-stubs-docs" &&
-			d.Name() != "system-api-stubs-docs" &&
-			d.Name() != "test-api-stubs-docs" {
+			d.Name() != "android.car-stubs-docs" {
 			cmd.Flag("--lints-as-errors")
 			cmd.Flag("--warnings-as-errors") // Most lints are actually warnings.
 		}