Merge vk-gl-cts/vulkan-cts-1.1.4 into vk-gl-cts/vulkan-cts-1.1.5

Change-Id: I2aa94658d6c8b6543fd9c4899f7da481ba1120a1

diff --cc android/cts/master/vk-master.txt
index 0e6e510,80e603a..145dd56
mode 100644,100755..100644
--- 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/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp
Simple merge

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