Merge "remove support for console in SurfaceFlinger"