Remove -debug suffix in apk names.

build/android/ant/sdk-targets.xml

Index: build/android/ant/sdk-targets.xml
diff --git a/build/android/ant/sdk-targets.xml b/build/android/ant/sdk-targets.xml
index b692f6ec670b6cbc371c727b35879581276c21e1..02b5b2950740a40e41ccf95573cb7be6e1f89cfd 100644
--- a/build/android/ant/sdk-targets.xml
+++ b/build/android/ant/sdk-targets.xml
@@ -108,7 +108,7 @@
       <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}"/>
@@ -138,9 +138,9 @@
 
   <!-- 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"
@@ -175,10 +175,6 @@
   <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>