Rename VulkanViewer to Viewer, take 2.

tools/viewer/android/main_android.cpp

 /*
 * Copyright 2016 Google Inc.
 *
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.
 */
 
 #include <jni.h>
 #include <errno.h>
 
 #include <android_native_app_glue.h>
 
 #include "../Application.h"
 #include "Timer.h"
 
 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
  * event loop for receiving input events and doing other things.
  */
 void android_main(struct android_app* state) {
     // Make sure glue isn't stripped.
     app_dummy();
 
     static const char* gCmdLine[] = {
-        "vulkanviewer",
+        "viewer",
         "--skps",
         "/data/local/tmp/skp",
     };
 
     std::unique_ptr<Application> vkApp(Application::Create(SK_ARRAY_COUNT(gCmdLine),
                                                            const_cast<char**>(gCmdLine),
                                                            state));
 
     double currentTime = 0.0;
     double previousTime = 0.0;
@@ skipping 19 matching lines @@
                 return;
             }
 
             previousTime = currentTime;
             currentTime = now_ms();
             vkApp->onIdle(currentTime - previousTime);
         }
     }
 }
 //END_INCLUDE(all)