Merge "Use the first Vulkan layer path" into nyc-mr1-dev