Fix problems from rebase

Author: larry-safran

xds/src/main/java/io/grpc/xds/client/ControlPlaneClient.java

@@ -100,9 +100,7 @@ final class ControlPlaneClient {
       SynchronizationContext syncContext,
       BackoffPolicy.Provider backoffPolicyProvider,
       Supplier<Stopwatch> stopwatchSupplier,
-      XdsClient xdsClient, // Has been replaced by xdsResponseHandler
-      MessagePrettyPrinter messagePrinter,
-      int order) {
+      MessagePrettyPrinter messagePrinter) {
     this.serverInfo = checkNotNull(serverInfo, "serverInfo");
     this.xdsTransport = checkNotNull(xdsTransport, "xdsTransport");
     this.xdsResponseHandler = checkNotNull(xdsResponseHandler, "xdsResponseHandler");

xds/src/test/java/io/grpc/xds/XdsClientFallbackTest.java

@@ -103,6 +103,7 @@ public void onResourceDoesNotExist(String resourceName) {
   @Mock
   private XdsClient.ResourceWatcher<XdsRouteConfigureResource.RdsUpdate> rdsWatcher2;
 
+  @SuppressWarnings("unchecked")
   private XdsClient.ResourceWatcher<XdsClusterResource.CdsUpdate> raalCdsWatcher =
       new XdsClient.ResourceWatcher<XdsClusterResource.CdsUpdate>() {