Merge "SurfaceFlinger: update OWNERS"