resolve merge conflicts of d097869 to nyc-dev
resolve merge conflicts of d097869 to nyc-dev

Change-Id: Id5780291dfd79a8256a0d979ce1e6d13a90293e9

KhronosGroup/VK-GL-CTS,KhronosGroup/Vulkan-CTS,KhronosGroup/VK-GL-CTS,chadversary/deqp,googlestadia/VK-GL-CTS,chadversary/deqp,KhronosGroup/VK-GL-CTS,KhronosGroup/VK-GL-CTS,KhronosGroup/Vulkan-CTS,googlestadia/VK-GL-CTS,googlestadia/VK-GL-CTS,KhronosGroup/Vulkan-CTS,chadversary/deqp,KhronosGroup/VK-GL-CTS,chadversary/deqp,googlestadia/VK-GL-CTS,googlestadia/VK-GL-CTS,KhronosGroup/Vulkan-CTS,chadversary/deqp,KhronosGroup/Vulkan-CTS,KhronosGroup/Vulkan-CTS,KhronosGroup/VK-GL-CTS,chadversary/deqp,googlestadia/VK-GL-CTS