Merge "SurfaceFlinger: get rid of LayerStats"