Merge "surfaceflinger is now always running in its own process"