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

Change-Id: I00246ec185fe843f4ca638ca0a4bfa34b8598cde