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

Change-Id: Ib40caa8ce640142fb378aab7583f6eef8d3e8ecd

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
Simple merge

diff --cc framework/delibs/debase/deDefs.c
Simple merge

diff --cc framework/delibs/debase/deDefs.h
Simple merge