vulkan: Combine wsi and util makefiles

Reviewed-by: Matt Turner <mattst88@gmail.com>
diff --git a/configure.ac b/configure.ac
index c83a523..44c7883 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2691,8 +2691,7 @@
 		src/mesa/main/tests/Makefile
 		src/util/Makefile
 		src/util/tests/hash_table/Makefile
-		src/vulkan/util/Makefile
-		src/vulkan/wsi/Makefile])
+		src/vulkan/Makefile])
 
 AC_OUTPUT