Merge "Enable drawing layers' borders in SurfaceFlinger."