Merge "Revert "SF: Introduce struct surfaceflinger::Config""