Move remaining Blimp feature code to core.

blimp/client/core/android/blimp_client_context_impl_android.h

Index: blimp/client/core/android/blimp_client_context_impl_android.h
diff --git a/blimp/client/core/android/blimp_client_context_impl_android.h b/blimp/client/core/android/blimp_client_context_impl_android.h
index 4e8657631c9a749c708b6e0789e7b63e142f8a6f..b8c3e1e278884b90c956a3060067a8c89985b58c 100644
--- a/blimp/client/core/android/blimp_client_context_impl_android.h
+++ b/blimp/client/core/android/blimp_client_context_impl_android.h
@@ -12,6 +12,8 @@
 namespace blimp {
 namespace client {
 
+class CompositorDependencies;
+
 // JNI bridge between BlimpClientContextImpl in Java and C++.
 class BlimpClientContextImplAndroid : public BlimpClientContextImpl {
  public:
@@ -25,7 +27,8 @@ class BlimpClientContextImplAndroid : public BlimpClientContextImpl {
   // operations.
   explicit BlimpClientContextImplAndroid(
       scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner,
-      scoped_refptr<base::SingleThreadTaskRunner> file_thread_task_runner);
+      scoped_refptr<base::SingleThreadTaskRunner> file_thread_task_runner,
+      std::unique_ptr<CompositorDependencies> compositor_dependencies);
   ~BlimpClientContextImplAndroid() override;
 
   base::android::ScopedJavaLocalRef<jobject> GetJavaObject();