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

Change-Id: I36e5fa9c5d58d2694b07bb1f0a2dfef0f1a44af0

diff --cc external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
index 80a7f27,bc73fe7..d1d89be
--- 1/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
--- 2/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
@@@ -2877,7 -2746,7 +2877,8 @@@ tcu::TestCaseGroup* createObjectManagem
                { "instance",                                   Instance::Parameters() },
        };
        // \note Device index may change - must not be static
-       const NamedParameters<Device>                                           s_deviceCases[]                                 =
++
+       const NamedParameters<Device>                           s_deviceCases[]                                 =
        {
                { "device",                                             Device::Parameters(testCtx.getCommandLine().getVKDeviceId()-1u, VK_QUEUE_GRAPHICS_BIT)  },
        };