split libsurfaceflinger_client and libcamera_client out of libui
diff --git a/rsContext.cpp b/rsContext.cpp
index 2e47ea3..2a0ccfb 100644
--- a/rsContext.cpp
+++ b/rsContext.cpp
@@ -19,6 +19,7 @@
 #include "rsThreadIO.h"
 #include <ui/FramebufferNativeWindow.h>
 #include <ui/EGLUtils.h>
+#include <surfaceflinger/Surface.h>
 
 #include <sys/types.h>
 #include <sys/resource.h>
diff --git a/rsContext.h b/rsContext.h
index 31d8cc8..caf9728 100644
--- a/rsContext.h
+++ b/rsContext.h
@@ -19,8 +19,6 @@
 
 #include "rsUtils.h"
 
-#include <ui/Surface.h>
-
 #include "rsThreadIO.h"
 #include "rsType.h"
 #include "rsMatrix.h"
@@ -46,6 +44,9 @@
 
 // ---------------------------------------------------------------------------
 namespace android {
+
+class Surface;
+
 namespace renderscript {
 
 class Context