Add AAR support to Chrome and convert support libraries to using AARs

third_party/android_media/BUILD.gn

Index: third_party/android_media/BUILD.gn
diff --git a/third_party/android_media/BUILD.gn b/third_party/android_media/BUILD.gn
index 9f79b5813e186583c2a3244ca241315d2f532b41..1abb90842cb60d54d68f22c9e6314ba74cd6bfaf 100644
--- a/third_party/android_media/BUILD.gn
+++ b/third_party/android_media/BUILD.gn
@@ -10,8 +10,8 @@ android_resources("android_media_resources") {
   custom_package = "org.chromium.third_party.android.media"
   resource_dirs = [ "java/res" ]
   deps = [
-    "//third_party/android_tools:android_support_v7_appcompat_resources",
-    "//third_party/android_tools:android_support_v7_mediarouter_resources",
+    "//third_party/android_tools:android_support_v7_appcompat_java",
+    "//third_party/android_tools:android_support_v7_mediarouter_java",
   ]
 }
 
@@ -20,7 +20,9 @@ android_library("android_media_java") {
       [ "java/src/org/chromium/third_party/android/media/MediaController.java" ]
   deps = [
     ":android_media_resources",
+    "//third_party/android_tools:android_support_annotations_java",
     "//third_party/android_tools:android_support_v13_java",
+    "//third_party/android_tools:android_support_v4_java",
     "//third_party/android_tools:android_support_v7_appcompat_java",
     "//third_party/android_tools:android_support_v7_mediarouter_java",
   ]