Revert "surfacefligner: revert recent BE/FE split changes"

This reverts commit 30505fb0e0f71b88eeed618200c35f9518144060.

Test: Manual and cts -m ViewTestCases

Change-Id: I8fb39243827b61baeba9bc30f9b70cf782dcb4b2
diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h
index f724096..5107e6b 100644
--- a/services/surfaceflinger/Layer.h
+++ b/services/surfaceflinger/Layer.h
@@ -472,6 +472,14 @@
         return getBE().mHwcLayers[displayId].layer;
     }
 
+    bool setHwcLayer(int32_t hwcId) {
+        if (getBE().mHwcLayers.count(hwcId) == 0) {
+            return false;
+        }
+        getBE().compositionInfo.hwc.hwcLayer = getBE().mHwcLayers[hwcId].layer;
+        return true;
+    }
+
     // -----------------------------------------------------------------------
 
     void clearWithOpenGL(const RenderArea& renderArea) const;