Revert "Clean up android_webview build scripts"

android_webview/javatests/android_webview_test_apk.xml

Index: android_webview/javatests/android_webview_test_apk.xml
diff --git a/android_webview/javatests/android_webview_test_apk.xml b/android_webview/javatests/android_webview_test_apk.xml
index b357e77d7c4e78068240eddc355dd05f07d44265..b50b71a131f505b5e6374132ebd13b9c3c9320b0 100644
--- a/android_webview/javatests/android_webview_test_apk.xml
+++ b/android_webview/javatests/android_webview_test_apk.xml
@@ -20,7 +20,7 @@
   <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}"/>
 
@@ -41,7 +41,7 @@
       <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>