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

Change-Id: I02c95168f5c66ea06ffd0d09dd0fa22fc33cb0a9

diff --cc AndroidGen.mk
Simple merge

diff --cc android/cts/master/vk-master.txt
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/src/extensions_data.txt
index 95bb7e2,abeda1f..690cc0e
--- 1/external/vulkancts/scripts/src/extensions_data.txt
--- 2/external/vulkancts/scripts/src/extensions_data.txt
+++ b/external/vulkancts/scripts/src/extensions_data.txt
@@@ -58,24 -58,17 +58,24 @@@ VK_KHR_image_format_list                                   DEVICE 1_2
  VK_KHR_sampler_ycbcr_conversion                               DEVICE 1_1_0
  VK_KHR_bind_memory2                                                   DEVICE 1_1_0
  VK_KHR_maintenance3                                                   DEVICE 1_1_0
 -VK_KHR_driver_properties                                      DEVICE
 -VK_KHR_shader_float_controls                          DEVICE
 -VK_KHR_depth_stencil_resolve                          DEVICE
 -VK_KHR_draw_indirect_count                                    DEVICE
 -VK_KHR_shader_atomic_int64                                    DEVICE
 -VK_KHR_vulkan_memory_model                                    DEVICE
 -VK_KHR_uniform_buffer_standard_layout         DEVICE
 -VK_KHR_imageless_framebuffer                          DEVICE
 +VK_KHR_driver_properties                                      DEVICE 1_2_0
 +VK_KHR_shader_float_controls                          DEVICE 1_2_0
 +VK_KHR_depth_stencil_resolve                          DEVICE 1_2_0
 +VK_KHR_draw_indirect_count                                    DEVICE 1_2_0
 +VK_KHR_shader_atomic_int64                                    DEVICE 1_2_0
 +VK_KHR_vulkan_memory_model                                    DEVICE 1_2_0
 +VK_KHR_uniform_buffer_standard_layout         DEVICE 1_2_0
 +VK_KHR_imageless_framebuffer                          DEVICE 1_2_0
 +VK_KHR_shader_subgroup_extended_types         DEVICE 1_2_0
 +VK_EXT_sampler_filter_minmax                          DEVICE 1_2_0
 +VK_EXT_shader_viewport_index_layer                    DEVICE 1_2_0
 +VK_EXT_descriptor_indexing                                    DEVICE 1_2_0
 +VK_EXT_scalar_block_layout                                    DEVICE 1_2_0
 +VK_KHR_buffer_device_address                          DEVICE 1_2_0
 +VK_EXT_host_query_reset                                               DEVICE 1_2_0
 +VK_KHR_separate_depth_stencil_layouts         DEVICE 1_2_0
 +VK_KHR_timeline_semaphore                                     DEVICE 1_2_0
 +VK_KHR_spirv_1_4                                                      DEVICE 1_2_0
 +VK_EXT_separate_stencil_usage                                 DEVICE 1_2_0
  VK_KHR_pipeline_executable_properties                 DEVICE
- VK_KHR_shader_clock                                                   DEVICE
 -VK_KHR_timeline_semaphore                                     DEVICE
+ VK_KHR_shader_clock                                                   DEVICE
 -VK_KHR_spirv_1_4                                                      DEVICE
 -VK_KHR_shader_subgroup_extended_types         DEVICE
 -VK_KHR_separate_depth_stencil_layouts         DEVICE