Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master