Add ContentVideoViewOverlay to AVDA.

media/gpu/avda_surface_bundle.cc

Index: media/gpu/avda_surface_bundle.cc
diff --git a/media/gpu/avda_surface_bundle.cc b/media/gpu/avda_surface_bundle.cc
index 12186a1b96cf2d5304b7091c85095ae9bfb76be4..608519bb936e3f4163421d2cc3f57fbea95a7554 100644
--- a/media/gpu/avda_surface_bundle.cc
+++ b/media/gpu/avda_surface_bundle.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "media/gpu/avda_surface_bundle.h"
+#include "media/base/android/android_overlay.h"
 
 namespace media {
 
@@ -11,7 +12,8 @@ AVDASurfaceBundle::AVDASurfaceBundle(int surface_id) : surface_id(surface_id) {}
 AVDASurfaceBundle::~AVDASurfaceBundle() {
   // Explicitly free the surface first, just to be sure that it's deleted before
   // the SurfaceTexture is.
-  surface = gl::ScopedJavaSurface();
+  surface_texture_surface = gl::ScopedJavaSurface();
+
   // Also release the back buffers.  We might want to let the consumer do this
   // after it has swapped the back buffer it wants, but we don't.
   if (surface_texture)