Rename VulkanViewer to Viewer, take 2.

platform_tools/android/apps/viewer/src/main/AndroidManifest.xml

Index: platform_tools/android/apps/viewer/src/main/AndroidManifest.xml
diff --git a/platform_tools/android/apps/vulkanviewer/src/main/AndroidManifest.xml b/platform_tools/android/apps/viewer/src/main/AndroidManifest.xml
similarity index 75%
rename from platform_tools/android/apps/vulkanviewer/src/main/AndroidManifest.xml
rename to platform_tools/android/apps/viewer/src/main/AndroidManifest.xml
index 634c7370830d4b08917a5fe0ce18d5c9cff7bd84..2ed88e1da65447bdf4bc390d24c196e09ede204c 100644
--- a/platform_tools/android/apps/vulkanviewer/src/main/AndroidManifest.xml
+++ b/platform_tools/android/apps/viewer/src/main/AndroidManifest.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- BEGIN_INCLUDE(manifest) -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="org.skia.vulkanviewer"
+          package="org.skia.viewer"
           android:versionCode="1"
           android:versionName="1.0">
 
   <application
       android:allowBackup="false"
-      android:label="VulkanViewer">
+      android:label="Viewer">
 
-    <activity android:name=".VulkanViewerActivity"
-              android:label="VulkanViewer"
+    <activity android:name=".ViewerActivity"
+              android:label="Viewer"
               android:screenOrientation="portrait"
               android:configChanges="orientation|keyboardHidden">
       <meta-data android:name="android.app.lib_name"
-                 android:value="vulkanviewer" />
+                 android:value="viewer" />
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
         <category android:name="android.intent.category.LAUNCHER" />