Merge "SurfaceFlinger: Hold lock while constructing BufferStateLayer"