Split Surface/SurfaceControl fallout

Change-Id: I7293782504fe594f364403fa4c3f99d0aa4cd572
1 file changed