Merge vk-gl-cts/vulkan-cts-1.3.2 into vk-gl-cts/vulkan-cts-1.3.3

Change-Id: I8472e4a680090ca421549ad5748572dd7e42bb55

diff --cc external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/vktTestCase.cpp
index 57feeaa,e239cbe..b9e6d8b
--- 1/external/vulkancts/modules/vulkan/vktTestCase.cpp
--- 2/external/vulkancts/modules/vulkan/vktTestCase.cpp
+++ b/external/vulkancts/modules/vulkan/vktTestCase.cpp
@@@ -650,10 -532,7 +650,8 @@@ bool Context::isDeviceFunctionalitySupp
                        if (extension == "VK_EXT_shader_viewport_index_layer")
                                return !!vk12Features.shaderOutputViewportIndex && !!vk12Features.shaderOutputLayer;
  
 +#ifndef CTS_USES_VULKANSC
                        const auto& vk13Features = m_device->getVulkan13Features();
-                       if (extension == "VK_EXT_image_robustness")
-                               return !!vk13Features.robustImageAccess;
                        if (extension == "VK_EXT_inline_uniform_block")
                                return !!vk13Features.inlineUniformBlock;
                        if (extension == "VK_EXT_pipeline_creation_cache_control")