Relanding "Add apk for running content_browsertests"

Revert "Revert 179189"

This reverts commit 5844ab0c6a41cc9d306f8c355cc7ceb5e290cbb1.

Original CL:https://codereview.chromium.org/12047068/
was reverted as we failed to update the bot scripts with the new package
name for content_shell_apk

[email protected],[email protected]
BUG=138275


Review URL: https://chromiumcodereview.appspot.com/12091033

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179428 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/content/content.gyp b/content/content.gyp
index 0155546..d15f86f 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -290,6 +290,7 @@
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base',
+            '../media/media.gyp:media_java',
             '../net/net.gyp:net',
             '../ui/ui.gyp:ui_java',
             'common_aidl',