Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/vulkan-cts-1.1.0

Change-Id: Ic87368f606cb8ec126d42ec9f72b1baffcdcf950

diff --cc external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
index 7589038,123b5a5..fb88fb3
--- 1/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
--- 2/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
@@@ -3346,8 -2615,8 +3370,8 @@@ public
                                                                                                                                                         const ResolveImageToImageOptions       options);
        virtual tcu::TestStatus                                         iterate                                         (void);
  protected:
 -      virtual tcu::TestStatus                                         checkTestResult                         (tcu::ConstPixelBufferAccess result);
 +      virtual tcu::TestStatus                                         checkTestResult                         (tcu::ConstPixelBufferAccess result = tcu::ConstPixelBufferAccess());
-       void                                                                            copyMSImageToMSImage            (void);
+       void                                                                            copyMSImageToMSImage            (deUint32 copyArraySize);
  private:
        Move<VkImage>                                                           m_multisampledImage;
        de::MovePtr<Allocation>                                         m_multisampledImageAlloc;