Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: Ie615d2294ca51629dd202087883acee9b0791f51

diff --cc android/cts/master/vk-master.txt
Simple merge

diff --cc external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
index 8c03cd5,510df2b..9cac520
--- 1/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
--- 2/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
@@@ -769,9 -768,9 +769,10 @@@ void checkDeviceExtensions (tcu::Result
                "VK_KHR_draw_indirect_count",
                "VK_KHR_create_renderpass2",
                "VK_KHR_driver_properties",
 +              "VK_KHR_swapchain_mutable_format",
                "VK_KHR_shader_atomic_int64",
                "VK_KHR_vulkan_memory_model",
+               "VK_KHR_swapchain_mutable_format",
        };
  
        checkKhrExtensions(results, extensions, DE_LENGTH_OF_ARRAY(s_allowedDeviceKhrExtensions), s_allowedDeviceKhrExtensions);

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

diff --cc external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
Simple merge

diff --cc external/vulkancts/mustpass/1.1.3/vk-default.txt
Simple merge