Relanding "Add apk for running content_browsertests"

content/content.gyp

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     'chromium_code': 1,  # Use higher warning level.
     'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/directxsdk)',
     'conditions': [
       ['inside_chromium_build==0', {
@@ skipping 272 matching lines @@
             'public/android/java/src/org/chromium/content/common/ISandboxedProcessCallback.aidl',
             'public/android/java/src/org/chromium/content/common/ISandboxedProcessService.aidl',
           ],
           'includes': [ '../build/java_aidl.gypi' ],
         },
         {
           'target_name': 'content_java',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base',
+            '../media/media.gyp:media_java',
             '../net/net.gyp:net',
             '../ui/ui.gyp:ui_java',
             'common_aidl',
             'content_common',
             'page_transition_types_java',
           ],
           'variables': {
             'package_name': 'content',
             'java_in_dir': '../content/public/android/java',
             'has_java_resources': 1,
@@ skipping 66 matching lines @@
             'include_dirs': [
               '<(SHARED_INTERMEDIATE_DIR)/content',
             ],
           },
           'includes': [ 'content_jni.gypi' ],
         },
       ],
     }],  # OS == "android"
   ],
 }