Merge "Vulkan: correctly expose Vulkan entry points" am: 8aeaf3c321
am: 2de7b6dd19

Change-Id: I81ffd27d714108df0b23f93fcf51f3495dd254c0