Improve Android scripts:

platform_tools/android/bin/android_setup.sh

Index: platform_tools/android/bin/android_setup.sh
diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh
index 6438b44aed91653a50466e2651db8431eea05556..a9b2c7955c065b85a983313601d6aef5ba90a470 100755
--- a/platform_tools/android/bin/android_setup.sh
+++ b/platform_tools/android/bin/android_setup.sh
@@ -146,9 +146,11 @@ setup_device() {
   source $SCRIPT_DIR/utils/setup_toolchain.sh
 
   DEFINES="${DEFINES} android_toolchain=${TOOLCHAIN_TYPE}"
-
   exportVar GYP_DEFINES "$DEFINES $GYP_DEFINES"
-  exportVar SKIA_OUT "${SKIA_OUT:-out/config/android-${TARGET_DEVICE}}"
+
+  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}}"
 }
 
 # adb_pull_if_needed(android_src, host_dst)