Fix crash in viewer on certain android devices

tools/viewer/sk_app/android/VulkanWindowContext_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 "WindowContextFactory_android.h"
 #include "../VulkanWindowContext.h"
 
 namespace sk_app {
 
 namespace window_context_factory {
 
 WindowContext* NewVulkanForAndroid(ANativeWindow* window, const DisplayParams& params) {
     auto createVkSurface = [window] (VkInstance instance) -> VkSurfaceKHR {
-        static PFN_vkCreateAndroidSurfaceKHR createAndroidSurfaceKHR = nullptr;
-        if (!createAndroidSurfaceKHR) {
-            createAndroidSurfaceKHR = (PFN_vkCreateAndroidSurfaceKHR)vkGetInstanceProcAddr(
-                instance, "vkCreateAndroidSurfaceKHR");
-        }
+        PFN_vkCreateAndroidSurfaceKHR createAndroidSurfaceKHR =
+                (PFN_vkCreateAndroidSurfaceKHR)vkGetInstanceProcAddr(instance,
+                                                                     "vkCreateAndroidSurfaceKHR");
 
         if (!window) {
             return VK_NULL_HANDLE;
         }
         VkSurfaceKHR surface;
 
         VkAndroidSurfaceCreateInfoKHR surfaceCreateInfo;
         memset(&surfaceCreateInfo, 0, sizeof(VkAndroidSurfaceCreateInfoKHR));
         surfaceCreateInfo.sType = VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR;
         surfaceCreateInfo.pNext = nullptr;
@@ skipping 10 matching lines @@
     WindowContext* ctx = new VulkanWindowContext(params, createVkSurface, canPresent);
     if (!ctx->isValid()) {
         delete ctx;
         return nullptr;
     }
     return ctx;
 }
 
 }  // namespace window_context_factory
 }  // namespace sk_app