Re-organize Android scripts

platform_tools/android/bin/android_gdb_exe

 #!/bin/bash
 #
 # android_gdb: Pushes gdbserver. Connects and enters debugging environment.
 
-deviceID=""
-while (( "$#" )); do
-
-  if [[ $(echo "$1" | grep "^-d$") != "" ]];
-  then
-    deviceID="$2"
-    shift
-  else
-    gdbVars=("${gdbVars[@]}" "$1")
-  fi
-
-  shift
-done
-
-# hack for x86 support in android_setup.sh
-if [ "$deviceID" == "x86" ] || [ "$deviceID" == "razr_i" ]
-then
-  export ANDROID_ARCH=x86
-fi
-
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+source $SCRIPT_DIR/android_setup.sh
 
 # setup the gdbserver
-$SCRIPT_DIR/android_gdbserver ${gdbVars[@]}
+$SCRIPT_DIR/android_gdbserver -d ${DEVICE_ID} ${APP_ARGS}
 
 # quit if gdbserver setup failed
 if [[ "$?" != "0" ]]; then
   echo "ERROR: gdbserver failed to setup properly."
   exit 1
 fi
 
 # Wait for gdbserver
 sleep 2
 
 # variables that must match those in gdb_server
 GDB_TMP_DIR=$(pwd)/android_gdb_tmp
-APP_NAME=$(basename ${gdbVars[0]})
+APP_NAME=${APP_ARGS[0]}
 PORT=5039
 
 # Set up gdb commands
 GDBSETUP=$GDB_TMP_DIR/gdb.setup
 echo "file $GDB_TMP_DIR/skia_launcher" >> $GDBSETUP
 echo "target remote :$PORT" >> $GDBSETUP
 echo "set solib-absolute-prefix $GDB_TMP_DIR" >> $GDBSETUP
 echo "set solib-search-path $GDB_TMP_DIR" >> $GDBSETUP
 
 # The apps shared library symbols are not loaded by default so we load them here
 echo "break launch_app" >> $GDBSETUP
 echo "continue" >> $GDBSETUP
 echo "sharedLibrary $APP_NAME" >> $GDBSETUP
 
-source $SCRIPT_DIR/android_setup.sh
-
 # Launch gdb client
 echo "Entering gdb client shell"
 if [ "$ANDROID_ARCH" == "x86" ]
 then
   $ANDROID_TOOLCHAIN/i686-linux-android-gdb -x $GDBSETUP
 else
   $ANDROID_TOOLCHAIN/arm-linux-androideabi-gdb -x $GDBSETUP
 fi
 
 # Clean up
 rm -rf $GDB_TMP_DIR