Merge "Move mSurfaceFlingerConsumer into BufferLayer"