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

Change-Id: Ie175674eca5fd0cbd2fe0b7e9ea5658adf74ba32

diff --cc AndroidGen.mk
Simple merge

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

diff --cc external/fetch_sources.py
index f360b87,078a5ff..e02694e
--- 1/external/fetch_sources.py
--- 2/external/fetch_sources.py
+++ b/external/fetch_sources.py
@@@ -257,12 -263,13 +263,13 @@@ PACKAGES = 
        GitRepo(
                "https://github.com/KhronosGroup/glslang.git",
                None,
-               "5ff3c3da3b374a03a5eff96544fcd6678ed575c1",
-               "glslang"),
+               "e9405d0b443a1849fa55b7bfeaceda586a1c37af",
+               "glslang",
+               removeTags = ['master-tot']),
        GitRepo(
 -              "https://github.com/KhronosGroup/SPIRV-Headers.git",
 -              None,
 -              "d5b2e1255f706ce1f88812217e9a554f299848af",
 +              "https://gitlab.khronos.org/spirv/SPIRV-Headers.git",
 +              "git@gitlab.khronos.org:spirv/SPIRV-Headers.git",
 +              "bb81abe5bc55c93055a1b2041b86515650456483",
                "spirv-headers"),
  ]
  

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

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

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

diff --cc external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
Simple merge

diff --cc external/vulkancts/mustpass/1.1.3/vk-default.txt
Simple merge