Merge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/vulkan-cts-1.2.1

Change-Id: I968d4cdd3c04321a4ff2544597203c77589a4d45