Merge vulkancts/vulkan-cts-1.0.2 into vulkancts/vulkan-cts-1.0-dev

Change-Id: I930987be3bb947d4fe51d9b931ed882f04e45a19