Cleanup android build files and tools

platform_tools/android/launcher/skia_launcher.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <dlfcn.h>
 #include <stdio.h>
 
@@ skipping 49 matching lines @@
         return -1;
     }
 
     // attempt to lookup the location of the skia app
     const char* appLocation = "/data/local/tmp";
     if (!file_exists(appLocation)) {
         printf("ERROR: Unable to find /data/local/tmp on the device.\n");
         return -1;
     }
 
-    void* skiaLibrary;
-
 #if defined(SKIA_DLL)
     // load the local skia shared library
-    skiaLibrary = load_library(appLocation, "skia_android");
+    void* skiaLibrary = load_library(appLocation, "skia_android");
     if (NULL == skiaLibrary)
     {
         return -1;
     }
 #endif
 
     // load the appropriate library
     void* appLibrary = load_library(appLocation, argv[1]);
     if (NULL == appLibrary) {
         return -1;
     }
 
-#if !defined(SKIA_DLL)
-    skiaLibrary = appLibrary;
-#endif
-
     // find the address of the main function
     int (*app_main)(int, const char**);
     *(void **) (&app_main) = dlsym(appLibrary, "main");
 
     if (!app_main) {
         printf("ERROR: Unable to load the main function of the selected program.\n");
         printf("ERROR: %s\n", dlerror());
         return -1;
     }
 
     // pass all additional arguments to the main function
     return launch_app(app_main, argc - 1, ++argv);
 }