Fix google_play_services_default_java including legacy_http_javalib as a dep...

Fix google_play_services_default_java including legacy_http_javalib as a dep rather than a classpath-only jar

Also fixes proguard() GN template not rebasing paths when it should be.

BUG=624003

Review-Url: https://codereview.chromium.org/2103193002
Cr-Commit-Position: refs/heads/master@{#402688}

build/config/android/internal_rules.gni

@@ -557,9 +557,7 @@ if (enable_java_templates) {
       if (defined(invoker.input_jars_paths)) {
         _input_jars_paths += invoker.input_jars_paths
       }
-      inputs = [
-        _proguard_jar_path,
-      ]
+      inputs = _input_jars_paths + [ _proguard_jar_path ]
       if (defined(invoker.alternative_android_sdk_jar)) {
         inputs += [ invoker.alternative_android_sdk_jar ]
         _rebased_android_sdk_jar =
@@ -591,7 +589,7 @@ if (enable_java_templates) {
         _rebased_android_sdk_jar,
       ]
       foreach(c, _input_jars_paths) {
-        args += [ "--classpath=" + c ]
+        args += [ "--classpath=" + rebase_path(c, root_build_dir) ]
       }
       if (proguard_verbose) {
         args += [ "--verbose" ]

build/secondary/third_party/android_tools/BUILD.gn

@@ -127,8 +127,8 @@ android_java_prebuilt("google_play_services_default_java") {
     ":android_support_v13_java",
     ":android_support_v7_mediarouter_java",
     ":google_play_services_default_resources",
-    ":legacy_http_javalib",
   ]
+  input_jars_paths = [ "$android_sdk/optional/org.apache.http.legacy.jar" ]
   proguard_preprocess = true
   proguard_config = "//third_party/android_tools/proguard.flags"
   jar_path = "$android_sdk_root/extras/google/google_play_services/libproject/google-play-services_lib/libs/google-play-services.jar"
@@ -151,5 +151,6 @@ android_java_prebuilt("android_support_v17_leanback_java") {
 
 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it.
 android_java_prebuilt("legacy_http_javalib") {
+  testonly = true
   jar_path = "$android_sdk/optional/org.apache.http.legacy.jar"
 }