Merge "Delete some SurfaceView support code."