Rename VulkanViewer to Viewer, take 2.

tools/viewer/android/main_android.cpp

Index: tools/viewer/android/main_android.cpp
diff --git a/tools/vulkan/android/main_android.cpp b/tools/viewer/android/main_android.cpp
similarity index 97%
rename from tools/vulkan/android/main_android.cpp
rename to tools/viewer/android/main_android.cpp
index 783cd1f7835f96749a61a182adda0e11a6c12ee7..9334f0ccd3bc4fff068b2d40e0868d36bdacd7e6 100644
--- a/tools/vulkan/android/main_android.cpp
+++ b/tools/viewer/android/main_android.cpp
@@ -15,6 +15,8 @@
 
 static double now_ms() { return SkTime::GetNSecs() * 1e-6; }
 
+using sk_app::Application;
+
 /**
  * This is the main entry point of a native application that is using
  * android_native_app_glue.  It runs in its own thread, with its own
@@ -25,7 +27,7 @@ void android_main(struct android_app* state) {
     app_dummy();
 
     static const char* gCmdLine[] = {
-        "vulkanviewer",
+        "viewer",
         "--skps",
         "/data/local/tmp/skp",
     };