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

Change-Id: If6fa58f063c431f0050146de3a7a288fbb22f239

diff --cc AndroidGen.mk
Simple merge

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

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

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

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