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

Change-Id: I36544847548d95fed2b094f00e7604f64790bdb0

diff --cc AndroidGen.mk
Simple merge

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

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

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

diff --cc external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.hpp
Simple merge

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