SampleApp: Make android_install_app and android_launch_app work consistently

platform_tools/android/bin/android_install_app

Index: platform_tools/android/bin/android_install_app
diff --git a/platform_tools/android/bin/android_install_app b/platform_tools/android/bin/android_install_app
index 01a792e9f9742953b6953b5fd7c3f12b1925adb0..4b29b098642795b774cd506dbe3ecba5e0368893 100755
--- a/platform_tools/android/bin/android_install_app
+++ b/platform_tools/android/bin/android_install_app
@@ -1,15 +1,15 @@
 #!/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 )"
@@ -43,8 +43,8 @@ for arg in ${APP_ARGS[@]}; do
 done
 
 if [[ ${app} == "" ]]; then
-  echo "defaulting to installing sample_app."
-  app="sample_app"
+  echo "Defaulting to installing SampleApp."
+  app="SampleApp"
 fi
 
 
@@ -61,6 +61,9 @@ else
     apk_suffix="debug.apk"
 fi
 
+if [[ ${app} == 'SampleApp' ]]; then
+    app="sample_app"
+fi
 
 APP_LC=$(echo $app | tr "[:upper:]" "[:lower:]")