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

Change-Id: Ia7b82ce3609ab3ab3669f43c9f14a50fd5977ec3

diff --cc AndroidGen.mk
Simple merge

diff --cc android/cts/master/vk-master.txt
index 4fd456a,72a4523..37ec163
mode 100755,100644..100755
--- 1/android/cts/master/vk-master.txt
--- 2/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt

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

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

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

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

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

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

diff --cc external/vulkancts/mustpass/1.0.3/vk-default.txt
index 7994f48,9dcd3fb..f4f4e66
mode 100755,100644..100755
--- 1/external/vulkancts/mustpass/1.0.3/vk-default.txt
--- 2/external/vulkancts/mustpass/1.0.3/vk-default.txt
+++ b/external/vulkancts/mustpass/1.0.3/vk-default.txt