Merge vk-gl-cts/vulkan-cts-1.1.3 into vk-gl-cts/vulkan-cts-1.1.4

Change-Id: Ic81486b5b158f0edf964d29a6e084a9c6e2dee00