Revert Move VideoCapture* files from media/base/android/... to media/capture/video/android/java/...

media/base/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/android/config.gni")
 import("//build/config/arm.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/config/linux/pkg_config.gni")
 import("//media/media_options.gni")
@@ skipping 231 matching lines @@
         "media_file_checker.h",
       ]
     }
 
     deps += [ "//third_party/ffmpeg" ]
   }
 
   if (is_android) {
     public_deps = [
       "//media/base/android",
+      "//media/base/android:media_java",
       "//media/base/android:media_jni_headers",
+      "//media/base/android:video_capture_jni_headers",
     ]
     allow_circular_includes_from += [ "//media/base/android" ]
   }
 
   if (is_linux && use_x11) {
     configs += [
       "//build/config/linux:x11",
       "//build/config/linux:xext",
 
       # TODO(ajwong): Why does xent get a separate thing in //build/config/linux:BUILD.gn
@@ skipping 285 matching lines @@
 }
 
 fuzzer_test("media_container_names_fuzzer") {
   sources = [
     "container_names_fuzzertest.cc",
   ]
   deps = [
     "//media",
   ]
 }