Revert "[Chromecast] Disable SurfaceControl and AImageReader for Android build"

This reverts commit 1eef2a38.

Reason for revert: This causes screen flickering. We'll make a platform fix to handle the playback stall.

Original change's description:
> [Chromecast] Disable SurfaceControl and AImageReader for Android build
>
> For Q+ devices, SurfaceControl and AImageReader may cause some video
> playback stall. Temporarily disable them.
>
> Bug: internal b/162803423
> Test: Bug is not repro
> Change-Id: I4ce7e42fd87433464dfe4a6b29b816cb41ce7138
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2493091
> Reviewed-by: Sean Topping <seantopping@chromium.org>
> Reviewed-by: Frank Liberato <liberato@chromium.org>
> Reviewed-by: Zhenyao Mo <zmo@chromium.org>
> Commit-Queue: Yuchen Liu <yucliu@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#820070}

TBR=zmo@chromium.org,liberato@chromium.org,seantopping@chromium.org,yucliu@chromium.org,csbubbles@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: internal b/162803423
Change-Id: Icdf7b5ede25bdd9b3ae0062d23ee6b43b5c30c38
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2511752Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Reviewed-by: Yuchen Liu <yucliu@chromium.org>
Commit-Queue: Yuchen Liu <yucliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#823363}

chromecast/browser/DEPS

@@ -50,7 +50,6 @@ include_rules = [
   "+extensions/shell/browser/api",
   "+gin/v8_initializer.h",
   "+gpu/command_buffer/service/gpu_switches.h",
-  "+gpu/config/gpu_finch_features.h",
   "+media/audio",
   "+media/base",
   "+media/mojo",

chromecast/browser/cast_content_browser_client.cc

@@ -105,7 +105,6 @@
 #include "chromecast/media/audio/cast_audio_manager_android.h"  // nogncheck
 #include "components/cdm/browser/cdm_message_filter_android.h"
 #include "components/crash/core/app/crashpad.h"
-#include "gpu/config/gpu_finch_features.h"
 #include "media/audio/android/audio_manager_android.h"
 #else
 #include "chromecast/browser/memory_pressure_controller_impl.h"
@@ -175,11 +174,8 @@ CastContentBrowserClient::CastContentBrowserClient(
       // TODO(juke): Reenable this after solving casting issue on LAN.
       blink::features::kMixedContentAutoupgrade,
 #if defined(OS_ANDROID)
-          ::media::kAudioFocusLossSuspendMediaSession,
-          ::media::kRequestSystemAudioFocus,
-          // Temporarily disable SurfaceControl and AImageReader to solve some
-          // video playback stall issue. Remove once b/162803423 is fixed.
-          ::features::kAndroidSurfaceControl, ::features::kAImageReader,
+      ::media::kAudioFocusLossSuspendMediaSession,
+      ::media::kRequestSystemAudioFocus,
 #endif
   });
 }