Merge "Remove unused dependencies in SurfaceFlinger" into rvc-dev