resolve merge conflicts of b6d3261 to nyc-mr1-dev-plus-aosp
resolve merge conflicts of b6d3261 to nyc-mr1-dev-plus-aosp

Test: Tried to run the install script locally
Change-Id: I2c34fa110c811741ad53bd42143bfd2a371b459a

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