Merge \\"Use the first Vulkan layer path\\" into nyc-mr1-dev am: bbadc5d313
am: 4f9e02e4b4

Change-Id: I140125840832f895b39ff29792883d0fec4fc110