Revert "Clean up android_webview build scripts"

android_webview/javatests/android_webview_test_apk.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   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.
 -->
 <project name="AndroidWebViewTest" default="debug" basedir=".">
 
   <description>
     Building AndroidWebViewTest.apk
   </description>
 
   <import file="../../build/android/ant/common.xml"/>
 
   <property name="target.abi" value="${APP_ABI}"/>
   <property name="out.dir" location="${PRODUCT_DIR}/android_webview_test"/>
   <property name="resource.absolute.dir" value="../res"/>
   <property name="gen.absolute.dir" value="${out.dir}/gen"/>
   <property name="native.libs.absolute.dir" location="${out.dir}/libs" />
   <property name="asset.absolute.dir" location="${out.dir}/assets" />
 
   <path id="out.dex.jar.input.ref">
-    <filelist files="${INPUT_JARS_PATHS}"/>
+    <fileset dir="${PRODUCT_DIR}/android_webview_test/java/libs"/>
   </path>
   <property name="java.compilerargs" value="-classpath ${toString:out.dex.jar.input.ref}"/>
 
   <!-- We expect PRODUCT_DIR to be set like the gyp var
        (e.g. $ROOT/out/Debug) -->
   <fail message="PRODUCT_DIR env var not set?">
     <condition>
       <not>
         <isset property="PRODUCT_DIR"/>
       </not>
     </condition>
   </fail>
 
   <target name="-post-compile">
     <!-- We also want a .jar as well as an .apk for AndroidWebViewTest-debug
          so that proguard can be used to list the tests by annotation. -->
     <jar destfile="${out.dir}/${ant.project.name}-debug.jar">
       <fileset dir="${out.dir}/classes" includes="**/*.class"/>
       <zipfileset
          includes="**/*.class"
-         src="${PRODUCT_DIR}/lib.java/chromium_android_webview_javatests.jar"/>
+         src="${PRODUCT_DIR}/android_webview/java/libs/chromium_android_webview_javatests.jar"/>
     </jar>
 
   </target>
 
   <!-- Classpath for javac -->
   <path id="javac.custom.classpath">
     <path refid="out.dex.jar.input.ref"/>
   </path>
   <import file="../../build/android/ant/sdk-targets.xml"/>
   <import file="${sdk.dir}/tools/ant/build.xml" />
 
 </project>