vulkan: allow drivers to see image acquire/release

Change-Id: I8143aeebd1f65142486cc55662c685d081ba41eb
(cherry picked from commit 58b4df743ecad9f1a0fc7cb7c0f5340dd8365308)
diff --git a/vulkan/nulldrv/null_driver.cpp b/vulkan/nulldrv/null_driver.cpp
index e1678ea..053e403 100644
--- a/vulkan/nulldrv/null_driver.cpp
+++ b/vulkan/nulldrv/null_driver.cpp
@@ -238,11 +238,11 @@
     if (strcmp(name, "vkGetSwapchainGrallocUsageANDROID") == 0)
         return reinterpret_cast<PFN_vkVoidFunction>(
             GetSwapchainGrallocUsageANDROID);
-    if (strcmp(name, "vkImportNativeFenceANDROID") == 0)
-        return reinterpret_cast<PFN_vkVoidFunction>(ImportNativeFenceANDROID);
-    if (strcmp(name, "vkQueueSignalNativeFenceANDROID") == 0)
+    if (strcmp(name, "vkAcquireImageANDROID") == 0)
+        return reinterpret_cast<PFN_vkVoidFunction>(AcquireImageANDROID);
+    if (strcmp(name, "vkQueueSignalReleaseImageANDROID") == 0)
         return reinterpret_cast<PFN_vkVoidFunction>(
-            QueueSignalNativeFenceANDROID);
+            QueueSignalReleaseImageANDROID);
     return nullptr;
 }
 
@@ -673,12 +673,12 @@
     return VK_SUCCESS;
 }
 
-VkResult ImportNativeFenceANDROID(VkDevice, VkSemaphore, int fence) {
+VkResult AcquireImageANDROID(VkDevice, VkImage, int fence, VkSemaphore) {
     close(fence);
     return VK_SUCCESS;
 }
 
-VkResult QueueSignalNativeFenceANDROID(VkQueue, int* fence) {
+VkResult QueueSignalReleaseImageANDROID(VkQueue, VkImage, int* fence) {
     *fence = -1;
     return VK_SUCCESS;
 }