SampleApp: Make android_install_app and android_launch_app work consistently

platform_tools/android/bin/android_install_app

 #!/bin/bash
 #
-# android_install_app: installs the skia sampleApp on the device.
+# android_install_app: installs the Skia development apps on the device.
 
 function print_usage {
-  echo "USAGE: android_install_app [options]"
+  echo "USAGE: android_install_app [options] AppName"
   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"
-  echo "              AppName Can be either sample_app or VisualBench"
+  echo "              AppName Can be either SampleApp or VisualBench"
 }
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 source $SCRIPT_DIR/android_setup.sh
 source $SCRIPT_DIR/utils/setup_adb.sh
 
 forceRemoval="false"
 app=""
 
@@ skipping 13 matching lines @@
     if [[ ${app} != "" ]]; then
       echo "ERROR: app already defined ${app}"
       exit 1;
     else
       app=${arg}
     fi
   fi
 done
 
 if [[ ${app} == "" ]]; then
-  echo "defaulting to installing sample_app."
-  app="sample_app"
+  echo "Defaulting to installing SampleApp."
+  app="SampleApp"
 fi
 
 
 if [[ "$forceRemoval" == "true" ]];
 then
     echo "Forcing removal of previously installed packages"
     $ADB ${DEVICE_SERIAL} uninstall com.skia > /dev/null
 fi
 
 if [[ "$BUILDTYPE" == "Release" ]];
 then
     apk_suffix="release.apk"
 else
     apk_suffix="debug.apk"
 fi
 
+if [[ ${app} == 'SampleApp' ]]; then
+    app="sample_app"
+fi
 
 APP_LC=$(echo $app | tr "[:upper:]" "[:lower:]")
 
 echo "Installing ${APP_LC} from ${APP_LC}/build/outputs/apk/${APP_LC}-${ANDROID_ARCH}-${apk_suffix}"
 $ADB ${DEVICE_SERIAL} install -r ${SCRIPT_DIR}/../apps/${APP_LC}/build/outputs/apk/${APP_LC}-${ANDROID_ARCH}-${apk_suffix}