Re-organize Android scripts

platform_tools/android/bin/android_gdbserver

 #!/bin/bash
 #
 # android_gdbserver: Pushes gdbserver. Starts debugging environment.
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-APP_NAME=$(basename $1)
+source $SCRIPT_DIR/android_setup.sh
+
+APP_NAME=${APP_ARGS[0]}
 PORT=5039
 
-# Collect extra arguments to be passed to the Skia binary
-shift
-while (( "$#" )); do
-  APP_ARGS="$APP_ARGS $1"
-  shift
-done
-
-source $SCRIPT_DIR/android_setup.sh
 source $SCRIPT_DIR/utils/setup_adb.sh
 
 # We need the debug symbols from these files
 GDB_TMP_DIR=$(pwd)/android_gdb_tmp
 mkdir $GDB_TMP_DIR
 echo "Copying symbol files"
 adb_pull_if_needed /system/bin/skia_launcher $GDB_TMP_DIR
 adb_pull_if_needed /system/lib/libc.so $GDB_TMP_DIR
 adb_pull_if_needed /data/data/com.skia/lib/libskia_android.so $GDB_TMP_DIR
 adb_pull_if_needed /data/data/com.skia/lib/lib$APP_NAME.so $GDB_TMP_DIR
@@ skipping 20 matching lines @@
 
 echo "Setting up port forward"
 $ADB forward "tcp:5039" "tcp:5039"
 
 # Kill all previous instances of gdbserver and skia_launcher to rid all port overriding errors.
 echo "Killing any running Skia processes."
 $ADB shell ps | grep gdbserver | awk '{print $2}' | xargs $ADB shell kill
 $ADB shell ps | grep skia_launcher | awk '{print $2}' | xargs $ADB shell kill
 
 # Starting up gdbserver in android shell
-echo "Starting gdbserver with command: skia_launcher $APP_NAME$APP_ARGS"
-$ADB shell gdbserver :5039 /system/bin/skia_launcher $APP_NAME$APP_ARGS & 
+echo "Starting gdbserver with command: skia_launcher $APP_ARGS"
+$ADB shell gdbserver :5039 /system/bin/skia_launcher $APP_ARGS &