Merge "Revert "SurfaceFlinger: Share ownership of layers between State and Handle.""