Merge vk-gl-cts/github-master into vk-gl-cts/master

Change-Id: I6e7da6cfd1fe7d69bccf4231f4b04d9d3fdbd30b

diff --cc AndroidGen.mk
Simple merge

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

diff --cc external/vulkancts/framework/vulkan/vkBasicTypes.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
Simple merge

diff --cc external/vulkancts/modules/vulkan/CMakeLists.txt
Simple merge

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

diff --cc external/vulkancts/scripts/src/vulkan.h.in
Simple merge