Merge "SF: Move SurfaceFlingerFactory.cpp out of the filegroup"