DO NOT MERGE: revert HWC2 changes

The changes are causing some issues with multi-window use cases.

Fixes: 64491794
Test: test gmail compose in multi-window + show taps enabled

Change-Id: I0b0a3f351ed48f81db89a71c78bf17bab8cb2acf
Signed-off-by: Adrian Salido <salidoa@google.com>
diff --git a/glworker.h b/glworker.h
index 158490c..222cf6f 100644
--- a/glworker.h
+++ b/glworker.h
@@ -43,8 +43,7 @@
 
   int Init();
   int Composite(DrmHwcLayer *layers, DrmCompositionRegion *regions,
-                size_t num_regions, const sp<GraphicBuffer> &framebuffer,
-                Importer *importer);
+                size_t num_regions, const sp<GraphicBuffer> &framebuffer);
   void Finish();
 
  private: