Merge "SurfaceFlinger: Remove BufferQueueLayer"