Remove -debug suffix in apk names.

build/android/ant/sdk-targets.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="chrome_sdk_overrides" >
   <!--
     Redefinition of targets used by SDK tools.
     Supported version: SDK tools revision 20.
@@ skipping 90 matching lines @@
       </if>
       <!--
         If the project needs a test jar then generate a jar containing
         all compiled classes and referenced jars.
         project.is.testapp is set by Android's ant build system based on the
         target's manifest. It is true only for instrumentation apks.
       -->
       <if condition="${project.is.testapp}">
         <then>
           <echo level="info">Creating test jar file:
-              ${ant.project.name}-debug.jar</echo>
+              ${ant.project.name}.jar</echo>
           <property-location name="create.test.jar.file"
               location="${CHROMIUM_SRC}/build/android/ant/create-test-jar.js"/>
           <script language="javascript" src="${create.test.jar.file}"/>
         </then>
       </if>
 
     </do-only-if-manifest-hasCode>
   </target>
 
   <!--
     For debug builds, the Android SDK tools create a key in ~/.android and sign the build with it.
     This has caused all kinds of issues. Instead, the debug build should be signed with a key in
     build/android/ant. The SDK tools do not provide any support for overriding that behavior and so
     instead one must use the hack below.
   -->
 
   <!-- Disables automatic signing. -->
   <property name="build.is.signing.debug" value="false"/>
 
   <!-- TODO(cjhopman): Remove this property when all gyp files define the CHROMIUM_SRC property. -->
   <property name="CHROMIUM_SRC" value="${PRODUCT_DIR}/../.." />
 
   <property name="key.store" value="${CHROMIUM_SRC}/build/android/ant/chromium-debug.keystore"/>
   <property name="key.store.password" value="chromium"/>
   <property name="key.alias" value="chromiumdebugkey"/>
   <property name="key.alias.password" value="chromium"/>
 
   <!-- SDK tools assume that out.packaged.file is signed and name it "...-unaligned" -->
   <property name="out.packaged.file"
-    value="${apks.dir}/${ant.project.name}-debug-unsigned.apk" />
+    value="${apks.dir}/${ant.project.name}-unsigned.apk" />
   <property name="out.unaligned.file"
-    value="${apks.dir}/${ant.project.name}-debug-unaligned.apk" />
+    value="${apks.dir}/${ant.project.name}-unaligned.apk" />
 
   <!-- By default, the SDK tools build only aligns the APK in the -do-debug target. -->
   <target name="-do-debug"
       depends="-set-debug-mode, -debug-obfuscation-check, -package, -post-package">
     <!-- only create apk if *not* a library project -->
     <do-only-if-not-library elseText="Library project: do not create apk..." >
       <sequential>
         <!-- Signs the APK -->
         <echo level="info">Signing final apk...</echo>
         <signapk
@@ skipping 14 matching lines @@
     <record-build-info />
   </target>
 
   <path id="native.libs.gdbserver">
     <fileset file="${android.gdbserver}"/>
   </path>
 
   <target name="-post-compile">
     <!--
       Copy gdbserver to main libs directory if building a non-instrumentation debug apk.
-      TODO(jrg): For now, Chrome on Android always builds native code
-      as Release and java/ant as Debug, which means we always install
-      gdbserver.  Resolve this discrepancy, possibly by making this
-      Release Official build java/ant as Release.
     -->
     <if>
       <condition>
         <and>
           <equals arg1="${build.target}" arg2="debug"/>
           <isfalse value="${project.is.testapp}"/>
         </and>
       </condition>
       <then>
         <echo message="Copying gdbserver to the apk to enable native debugging"/>
@@ skipping 83 matching lines @@
           -libraryjars  ${project.target.classpath.value}
           -dump         "${obfuscate.absolute.dir}/dump.txt"
           -printseeds   "${obfuscate.absolute.dir}/seeds.txt"
           -printusage   "${obfuscate.absolute.dir}/usage.txt"
           -printmapping "${obfuscate.absolute.dir}/mapping.txt"
         </proguard>
       </then>
     </if>
   </target>
 </project>