SF: Merge BufferStateLayer into Layer

Test: go/wm-smoke
Bug: 238781169

Change-Id: I1521ffa6995ce41a04a664ff65516431aead4dca
7 files changed