Merge in fixes from Khronos Vulkan CTS repository