Merge vk-gl-cts/vulkan-cts-1.2.1 into vk-gl-cts/vulkan-cts-1.2.2

Change-Id: Ib9d2d64c02625ed43632c2a6b35afdf8d71cafcf

diff --cc AndroidGen.mk
Simple merge

diff --cc android/cts/master/vk-master-2020-03-01.txt
index ce10fe4,9010059..2198d62
--- 1/android/cts/master/vk-master-2020-03-01.txt
--- 2/android/cts/master/vk-master-2020-03-01.txt
+++ b/android/cts/master/vk-master-2020-03-01.txt
@@@ -86371,18 -78973,16 +86371,26 @@@ dEQP-VK.binding_model.buffer_device_add
  dEQP-VK.binding_model.buffer_device_address.set31.depth2.basessbo.crossconvertp2u.store.replay.std140.comp
  dEQP-VK.binding_model.buffer_device_address.set31.depth2.basessbo.crossconvertp2u.store.replay.std140.frag
  dEQP-VK.binding_model.buffer_device_address.set31.depth2.basessbo.crossconvertp2u.store.replay.std140.vert
 +dEQP-VK.binding_model.buffer_device_address.capture_replay_stress.seed_0
 +dEQP-VK.binding_model.buffer_device_address.capture_replay_stress.seed_1
 +dEQP-VK.binding_model.buffer_device_address.capture_replay_stress.seed_2
 +dEQP-VK.binding_model.buffer_device_address.capture_replay_stress.seed_3
 +dEQP-VK.binding_model.buffer_device_address.capture_replay_stress.seed_4
 +dEQP-VK.binding_model.buffer_device_address.capture_replay_stress.seed_5
 +dEQP-VK.binding_model.buffer_device_address.capture_replay_stress.seed_6
 +dEQP-VK.binding_model.buffer_device_address.capture_replay_stress.seed_7
 +dEQP-VK.binding_model.buffer_device_address.capture_replay_stress.seed_8
 +dEQP-VK.binding_model.buffer_device_address.capture_replay_stress.seed_9
  dEQP-VK.spirv_assembly.instruction.compute.spirv_version.1_4_compute
  dEQP-VK.spirv_assembly.instruction.compute.spirv_version.1_5_compute
+ dEQP-VK.spirv_assembly.instruction.compute.non_semantic_info.basic
+ dEQP-VK.spirv_assembly.instruction.compute.non_semantic_info.dummy_instruction_set
+ dEQP-VK.spirv_assembly.instruction.compute.non_semantic_info.large_instruction_number
+ dEQP-VK.spirv_assembly.instruction.compute.non_semantic_info.many_parameters
+ dEQP-VK.spirv_assembly.instruction.compute.non_semantic_info.any_constant_type
+ dEQP-VK.spirv_assembly.instruction.compute.non_semantic_info.any_constant_type_used
+ dEQP-VK.spirv_assembly.instruction.compute.non_semantic_info.any_non_constant_type
+ dEQP-VK.spirv_assembly.instruction.compute.non_semantic_info.placement
  dEQP-VK.spirv_assembly.instruction.compute.opfunord.equal
  dEQP-VK.spirv_assembly.instruction.compute.opfunord.less
  dEQP-VK.spirv_assembly.instruction.compute.opfunord.lessequal

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

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

diff --cc external/vulkancts/modules/vulkan/subgroups/vktSubgroupsTestsUtils.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