Relanding "Add apk for running content_browsertests"

build/android/gdb_apk

 #!/bin/bash
 #
 # 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.
 #
 # Attach gdb to a running android application.  Similar to ndk-gdb.
 # Run with --annotate=3 if running under emacs (M-x gdb).
 #
 # By default it is used to debug content shell, if it is used to
@@ skipping 78 matching lines @@
   if [ $# -ge ${OPTIND} ]; then
     eval echo "Unexpected command line argument: \${${OPTIND}}"
     usage
     exit 1
   fi
 }
 
 rooted_phone=0
 
 root=$(dirname $0)/../..
-package_name=org.chromium.content_shell
+package_name=org.chromium.content_shell_apk
 shared_lib_dir=$root/out/${BUILDTYPE:-Debug}/lib.target
 gdb_args=''
 
 #process options
 process_options "$@"
 echo "Debug package $package_name"
 echo "Assume native shared library is under $shared_lib_dir"
 
 data_dir=/data/data/$package_name
 gdb_server_on_device=$data_dir/lib/gdbserver
@@ skipping 52 matching lines @@
 if [[ ! -f ${gdb} ]] ; then
   echo "Wow no gdb in env var ANDROID_TOOLCHAIN which is $ANDROID_TOOLCHAIN"
   exit 4
 else
   echo Using $gdb
 fi
 
 # ${gdb} -x $cmdfile $* $app_process
 ${gdb} -x $cmdfile $gdb_args
 rm $cmdfile