Update documents/scripts for SampleApp removal

site/user/quick/android.md

Index: site/user/quick/android.md
diff --git a/site/user/quick/android.md b/site/user/quick/android.md
index 53e7139215576be5f2409d8045cb16f8f24225d8..7c7d0762b84ffdcdcdffc430bbf2a9a1d4483d91 100644
--- a/site/user/quick/android.md
+++ b/site/user/quick/android.md
@@ -18,7 +18,7 @@ Check out the source code
 Follow the instructions [here](../download) for downloading the Skia source. 
 
 Inside your Skia checkout, `platform_tools/android` contains the Android setup
-scripts, Android specific dependencies, and the Android Sample App.
+scripts, Android specific dependencies, and the Android Viewer App.
 
 You may need to [install other dependencies](./linux#prerequisites):
 
@@ -40,7 +40,7 @@ where you installed the SDK and run the following commands
 
 From here you will need to type 'y' to approve the license agreement and that
 is all.  You will then have downloaded the SDK for API level 19 and 23(Android 4.4
-KitKat and Android 6.0 Marshmallow) which will be used to build the Skia SampleApp.  
+KitKat and Android 6.0 Marshmallow) which will be used to build the Skia Viewer app.
 You can download as many other Android add-ons or APIs as you want, but you only 
 are required to have these two in order to complete the Skia build process.
 
@@ -134,36 +134,36 @@ approach will also produce the noisiest results.
     # <input> is file/dir on device
     ./platform_tools/android/bin/android_run_skia --release nanobench --skps <input>
 
-Build and run SampleApp
+Build and run Viewer App
 -----------------------
 
-The SampleApp on Android provides a simple UI for viewing sample slides and gm images.
+The Viewer App on Android provides a simple UI for viewing sample slides and gm images.
 
-    BUILDTYPE=Debug ./platform_tools/android/bin/android_ninja -d $TARGET_DEVICE SampleApp_APK
+    BUILDTYPE=Debug ./platform_tools/android/bin/android_ninja -d $TARGET_DEVICE Viewer_APK
 
 Then, install the app onto the device:
 
     ./platform_tools/android/bin/android_install_app
 
-Finally to run the application you can either navigate to the Skia Samples
+Finally to run the application you can either navigate to the Skia Viewer
 application using the application launcher on your device or from the command
 line.  The command line option allows you to pass additional details to the
 application (similar to other operating system) that specify where to find
 skp files and other resources.
 
-    ./platform_tools/android/bin/android_launch_app --resourcePath /data/local/tmp/resources
+    ./platform_tools/android/bin/android_launch_app
 
 By default if no additional parameters are specified the app will use the default
 parameters...
 
-    --resourcePath /data/local/tmp/skia_resoures 

[djsollen, 2016/07/11 22:54:53]

what about other resources needed by the GMs?

[liyuqian, 2016/07/12 13:51:56]

Done.

-    --pictureDir /data/local/tmp/skia_skp
+    --skps /data/local/tmp/skia
+    --jpgs /data/local/tmp/skia
 
 
 Android Studio Support
 -----------------------
 
-You can also build and run SampleApp (and some other experimental apps) using Android
+You can also build and run Viewer App (and some other experimental apps) using Android
 Studio.  To create the project either select "import project" from the quickstart
 screen or use File -> Open.  In both cases you'll need to select ./platform_tools/android/apps
 as the root directory of your project.
@@ -178,7 +178,7 @@ to depot_tools.  The syntax and location of that file is...
     depot_tools.dir=<path_to_depot_tools>
     
 That should be all the setup you need.  You should now be able to build and deploy
-SampleApp on ARM, Intel, and MIPS devices.
+Viewer App on ARM, Intel, and MIPS devices.
 
 
 Build tools
@@ -205,7 +205,7 @@ Note: The debugging scripts do not build the app - you'll have to do that first.
     # include additional arguments in quotes (e.g. "dm --nopdf")
     ./platform_tools/android/bin/android_gdb_native dm
     
-    # SAMPLE APP
+    # VIEWER APP
     # make sure you've installed the app on the device first
     ./platform_tools/android/bin/android_gdb_app [-d device_id]