Merge branch 'vulkan-cts-1.2.7'

Change-Id: I0034a268b5c4dd313953bf4cd8b6511fd3b5635e

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

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

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

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

diff --cc scripts/android/build_apk.py
Simple merge