more clean-up in preparation of bigger changes

the most important change here is the renaming of
ISurfaceFlingerClient to ISurfaceComposerClient

Change-Id: I94e18b0417f50e06f21377446639c61f65f959b3
diff --git a/include/surfaceflinger/SurfaceComposerClient.h b/include/surfaceflinger/SurfaceComposerClient.h
index 102aebc..8e28a81 100644
--- a/include/surfaceflinger/SurfaceComposerClient.h
+++ b/include/surfaceflinger/SurfaceComposerClient.h
@@ -149,7 +149,7 @@
                 // these don't need to be protected because they never change
                 // after assignment
                 status_t                    mStatus;
-                sp<ISurfaceFlingerClient>   mClient;
+                sp<ISurfaceComposerClient>  mClient;
 };
 
 // ---------------------------------------------------------------------------
@@ -161,7 +161,7 @@
     SharedClient*               mControl;
     sp<IMemoryHeap>             mControlMemory;
     sp<IBinder>                 mConnection;
-    sp<ISurfaceComposer>        mSignalServer;
+    sp<ISurfaceComposer>        mComposerService;
     void init(const sp<IBinder>& conn);
 public:
     explicit SurfaceClient(const sp<IBinder>& conn);