SurfaceFlinger cleanup

mostly refactored SurfaceFlinger.h, but also removed dead code.
cleaned-up a few includes as well.

Change-Id: Ib15f4ffe567912b61ee98aa076c6a283b72811b5
diff --git a/services/surfaceflinger/DisplayHardware.cpp b/services/surfaceflinger/DisplayHardware.cpp
index af33a89..6a8a55d 100644
--- a/services/surfaceflinger/DisplayHardware.cpp
+++ b/services/surfaceflinger/DisplayHardware.cpp
@@ -40,6 +40,7 @@
 #include "DisplayHardware.h"
 #include "GLExtensions.h"
 #include "SurfaceFlinger.h"
+#include "LayerBase.h"
 
 // ----------------------------------------------------------------------------
 using namespace android;
@@ -102,7 +103,7 @@
         int display,
         const sp<SurfaceTextureClient>& surface,
         EGLConfig config)
-    : DisplayHardwareBase(flinger, display),
+    : DisplayHardwareBase(display),
       mFlinger(flinger),
       mDisplayId(display),
       mHwc(0),