Revert 156233 - Make apks be built in a consistent way

content/shell/android/javatests/content_shell_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="ContentShellTest" default="debug" basedir=".">
 
   <description>
     Building ContentShellTest.apk
   </description>
 
   <import file="../../../../build/android/ant/common.xml"/>
 
   <property name="target.abi" value="${APP_ABI}"/>
   <property name="out.dir" location="${PRODUCT_DIR}/content_shell_test"/>
-  <property name="resource.absolute.dir" value="${RESOURCE_DIR}"/>
+  <property name="resource.absolute.dir" value="../res"/>
   <property name="gen.absolute.dir" value="${out.dir}/gen"/>
   <path id="native.libs.gdbserver">
     <fileset file="${android.gdbserver}"/>
   </path>
   <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}"/>
     <pathelement location="${PRODUCT_DIR}/content_shell/classes"/>
@@ skipping 43 matching lines @@
   </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>