Merge "Rework how RenderEngine and SurfaceFlinger include Skia"