Revert of Improve Android scripts:

platform_tools/android/bin/android_setup.sh

 #!/bin/bash
 #
 # android_setup.sh: Sets environment variables used by other Android scripts.
 
 # Fail-fast if anything in the script fails.
 set -e
 
 BUILDTYPE=${BUILDTYPE-Debug}
 
 while (( "$#" )); do
@@ skipping 128 matching lines @@
       ;;
   esac
 
   verbose "The build is targeting the device: $TARGET_DEVICE"
   exportVar DEVICE_ID $TARGET_DEVICE
 
   # setup the appropriate cross compiling toolchains
   source $SCRIPT_DIR/utils/setup_toolchain.sh
 
   DEFINES="${DEFINES} android_toolchain=${TOOLCHAIN_TYPE}"
+
   exportVar GYP_DEFINES "$DEFINES $GYP_DEFINES"
-
-  SKIA_SRC_DIR=$(cd "${SCRIPT_DIR}/../../.."; pwd)
-  DEFAULT_SKIA_OUT="${SKIA_SRC_DIR}/out/config/android-${TARGET_DEVICE}"
-  exportVar SKIA_OUT "${SKIA_OUT:-${DEFAULT_SKIA_OUT}}"
+  exportVar SKIA_OUT "${SKIA_OUT:-out/config/android-${TARGET_DEVICE}}"
 }
 
 # adb_pull_if_needed(android_src, host_dst)
 adb_pull_if_needed() {
 
   # get adb location
   source $SCRIPT_DIR/utils/setup_adb.sh
 
   # read input params
   ANDROID_SRC="$1"
@@ skipping 56 matching lines @@
       echo -n "$ANDROID_DST "
       $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST
     fi
   else
     echo -n "$ANDROID_DST "
     $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST
   fi
 }
 
 setup_device "${DEVICE_ID}"