Merge "Delete typo in SurfaceFlinger documentation"