Merge "Delete border rendering code from SurfaceFlinger." into main