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

Change-Id: I3c71a44f938957762072d8e08d6ce570157185fc