Merge "Add VK1.1 entries to NDK libvulkan and fix a bug"