SF: merge BufferLayer and BufferStateLayer

Test: builds and boots
Bug: 238781169

Change-Id: If4b22aea96ba9c0c52df16a0af5fad648afc4cf1
7 files changed