Revert of Improve Android scripts:

platform_tools/android/bin/android_gdb_exe

 #!/bin/bash
 #
 # android_gdb: Pushes gdbserver. Connects and enters debugging environment.
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source $SCRIPT_DIR/android_setup.sh
 
 # setup the gdbserver
 export BUILDTYPE  # from android_setup.sh
 $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=${APP_ARGS[0]}
 PORT=5039
 
 # Set up gdb commands
 GDBSETUP=$GDB_TMP_DIR/gdb.setup
-{
-    echo "file ${GDB_TMP_DIR}/skia_launcher"
-    echo "target remote :${PORT}"
-    echo "set solib-absolute-prefix ${GDB_TMP_DIR}"
-    echo "set solib-search-path ${GDB_TMP_DIR}
+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"
-    echo "continue"
-    echo "sharedLibrary ${APP_NAME}"
-} > $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
 
 # Launch gdb client
 echo "Entering gdb client shell"
 GDB_COMMAND=$(command ls "$ANDROID_TOOLCHAIN"/*-gdb | head -n1)
 "$GDB_COMMAND" -x $GDBSETUP
 
 # Clean up
 rm -rf $GDB_TMP_DIR