Remove -debug suffix in apk names.

build/android/pylib/test_options_parser.py

 # 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.
 
 """Parses options for the instrumentation tests."""
 
 import constants
 import optparse
 import os
 import sys
@@ skipping 108 matching lines @@
     option_parser.error('Options java_only (-j) and python_only (-p) '
                         'are mutually exclusive.')
 
   options.run_java_tests = True
   options.run_python_tests = True
   if options.java_only:
     options.run_python_tests = False
   elif options.python_only:
     options.run_java_tests = False
 
-  # In case of SDK Build, the jars and apks have a -debug suffix.
   options.test_apk_path = os.path.join(_SDK_OUT_DIR,
                                        options.build_type,
                                        constants.SDK_BUILD_APKS_DIR,
-                                       '%s-debug.apk' % options.test_apk)
+                                       '%s.apk' % options.test_apk)
   options.test_apk_jar_path = os.path.join(_SDK_OUT_DIR,
                                            options.build_type,
                                            constants.SDK_BUILD_TEST_JAVALIB_DIR,
-                                           '%s-debug.jar' % options.test_apk)
+                                           '%s.jar' % options.test_apk)
   if options.annotation_str:
     options.annotation = options.annotation_str.split()
   elif options.test_filter:
     options.annotation = []
   else:
     options.annotation = ['Smoke', 'SmallTest', 'MediumTest', 'LargeTest']