cleanup, remove unused fields. Also make sure that we don't systematically...

cleanup, remove unused fields. Also make sure that we don't systematically allocate a Surface in Surface.java if only a SurfaceControl is needed (Common case).