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

Change-Id: I23fd4e87db24b61dbd7e8c72662e2b4c3b903e54

diff --cc android/cts/master/vk-master.txt
index a1b0a74,aa9eb97..0dccdb1
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/vktApiImageClearingTests.cpp
Simple merge

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

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

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

diff --cc external/vulkancts/mustpass/1.1.0/vk-default.txt
index 0de4fe5,d99eca0..a2022b9
mode 100755,100644..100755
--- 1/external/vulkancts/mustpass/1.1.0/vk-default.txt
--- 2/external/vulkancts/mustpass/1.0.3/vk-default.txt
+++ b/external/vulkancts/mustpass/1.1.0/vk-default.txt