default to device type of last build if no device type is given

platform_tools/android/bin/android_install_apk

 #!/bin/bash
 #
 # android_install_skia: installs the skia apk on the device.
 
 function print_usage {
   echo "USAGE: android_install_skia [options]"
   echo " Options:         -f  Forces the package to be installed by removing any"
   echo "                      previously installed packages"
   echo "                  -h  Prints this help message"
   echo "            --release Install the release build of Skia"
   echo "      -s [device_s/n] Serial number of the device to be used"
 }
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
+source $SCRIPT_DIR/android_setup.sh
 source $SCRIPT_DIR/utils/setup_adb.sh
-source $SCRIPT_DIR/utils/setup_skia_out.sh
 
 forceRemoval="false"
 installLauncher="false"
 installOptions="-r"
 configuration="Debug"
 
 while (( "$#" )); do
 
   if [[ "$1" == "-f" ]];
   then
@@ skipping 18 matching lines @@
 done
 
 if [[ "$forceRemoval" == "true" ]];
 then
     echo "Forcing removal of previously installed packages"
     $ADB ${DEVICE_SERIAL} uninstall com.skia > /dev/null
 fi
 
 echo "Installing Skia App from ${SKIA_OUT}/${configuration}"
 $ADB ${DEVICE_SERIAL} install ${installOptions} ${SKIA_OUT}/${configuration}/android/bin/SkiaAndroid.apk