Merge "[SurfaceFlinger] Clean-up dead code"