Replace SurfaceControl#destroy with #remove

Because there may be other references, #destroy does
not actually destroy a Surface. We try and make this more clear
in the naming.

Bug: 111297488
Test: Builds
Change-Id: I3a395abf4449de27fac298e37a96eb54c204c42f