Revert "RenderScript should not depend on libsurfaceflinger_client.so"

This reverts commit 88b55fb090ace1a835f890758866f42f03795c12.
diff --git a/libs/rs/rsContext.h b/libs/rs/rsContext.h
index 03e65f1..caf9728 100644
--- a/libs/rs/rsContext.h
+++ b/libs/rs/rsContext.h
@@ -41,11 +41,12 @@
 #include "rsgApiStructs.h"
 #include "rsLocklessFifo.h"
 
-#include <ui/egl/android_natives.h>
 
 // ---------------------------------------------------------------------------
 namespace android {
 
+class Surface;
+
 namespace renderscript {
 
 class Context
@@ -98,7 +99,7 @@
 
     void pause();
     void resume();
-    void setSurface(uint32_t w, uint32_t h, android_native_window_t *sur);
+    void setSurface(uint32_t w, uint32_t h, Surface *sur);
     void setPriority(int32_t p);
 
     void assignName(ObjectBase *obj, const char *name, uint32_t len);
@@ -238,7 +239,7 @@
 
     static void * threadProc(void *);
 
-    android_native_window_t *mWndSurface;
+    Surface *mWndSurface;
 
     Vector<ObjectBase *> mNames;