surfaceflinger: remove SurfaceFlingerConsumer

Move everything into the base class, BufferLayerConsumer.

Test: boots
Change-Id: I62cd88d1bd0c7686f8c44e7b70cf216ffc2fba89
diff --git a/services/surfaceflinger/BufferLayerConsumer.h b/services/surfaceflinger/BufferLayerConsumer.h
index 4f8e5fa..cc35a66 100644
--- a/services/surfaceflinger/BufferLayerConsumer.h
+++ b/services/surfaceflinger/BufferLayerConsumer.h
@@ -96,6 +96,9 @@
     status_t updateTexImage(BufferRejecter* rejecter, const DispSync& dispSync, bool* autoRefresh,
                             bool* queuedBuffer, uint64_t maxFrameNumber);
 
+    // See BufferLayerConsumer::bindTextureImageLocked().
+    status_t bindTextureImage();
+
     // setReleaseFence stores a fence that will signal when the current buffer
     // is no longer being read. This fence will be returned to the producer
     // when the current buffer is released by updateTexImage(). Multiple
@@ -105,6 +108,8 @@
 
     bool releasePendingBuffer();
 
+    sp<Fence> getPrevFinalReleaseFence() const;
+
     // getTransformMatrix retrieves the 4x4 texture coordinate transform matrix
     // associated with the texture image set by the most recent call to
     // updateTexImage.