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

Change-Id: I0cd293e2cb716e77870aa6b43d86125050ff1482

diff --cc AndroidGen.mk
Simple merge

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

diff --cc external/vulkancts/modules/vulkan/image/vktImageTranscodingSupportTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp
Simple merge

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