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

Change-Id: I32be1e098131623df73a3c70ed5fc7fac2f9e3a6

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

diff --cc external/vulkancts/framework/vulkan/vkBasicTypes.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkPrograms.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
Simple merge

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

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

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

diff --cc external/vulkancts/scripts/gen_framework.py
Simple merge