Fix crash in viewer on certain android devices

tools/viewer/sk_app/android/VulkanWindowContext_android.cpp

Index: tools/viewer/sk_app/android/VulkanWindowContext_android.cpp
diff --git a/tools/viewer/sk_app/android/VulkanWindowContext_android.cpp b/tools/viewer/sk_app/android/VulkanWindowContext_android.cpp
index 68f2051f3aa636ef9730b335dc372cb7f5c18eb2..7467dbb7538a147120607331c268bb662a819527 100644
--- a/tools/viewer/sk_app/android/VulkanWindowContext_android.cpp
+++ b/tools/viewer/sk_app/android/VulkanWindowContext_android.cpp
@@ -15,11 +15,9 @@ 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(
+        PFN_vkCreateAndroidSurfaceKHR createAndroidSurfaceKHR = nullptr;

[jvanverth1, 2016/08/11 14:05:13]

Merge these two lines together?

+        createAndroidSurfaceKHR = (PFN_vkCreateAndroidSurfaceKHR)vkGetInstanceProcAddr(
                 instance, "vkCreateAndroidSurfaceKHR");
-        }
 
         if (!window) {
             return VK_NULL_HANDLE;